new file mode 100644--- /dev/null+++ b/dom/nfc/NfcContentHelper.manifest@@ -0,0 +1,7 @@+# This Source Code Form is subject to the terms of the Mozilla Public+# License, v. 2.0. If a copy of the MPL was not distributed with this+# file, You can obtain one at http://mozilla.org/MPL/2.0/.+# NfcContentHelper.js+component {4d72c120-da5f-11e1-9b23-0800200c9a66} NfcContentHelper.js+contract @mozilla.org/nfc/content-helper;1 {4d72c120-da5f-11e1-9b23-0800200c9a66}+category profile-after-change NfcContentHelper @mozilla.org/nfc/content-helper;1

--- a/mobile/android/base/GeckoApp.java+++ b/mobile/android/base/GeckoApp.java@@ -1909,17 +1909,17 @@ public abstract class GeckoApp if (!Versions.feature14Plus) { // Update accessibility settings in case it has been changed by the // user. On API14+, this is handled in LayerView by registering an // accessibility state change listener. GeckoAccessibility.updateAccessibilitySettings(this); } if (mAppStateListeners != null) {- for (GeckoAppShell.AppStateListener listener: mAppStateListeners) {+ for (GeckoAppShell.AppStateListener listener : mAppStateListeners) { listener.onResume(); } } // We use two times: a pseudo-unique wall-clock time to identify the // current session across power cycles, and the elapsed realtime to // track the duration of the session. final long now = System.currentTimeMillis();@@ -1941,17 +1941,17 @@ public abstract class GeckoApp final HealthRecorder rec = mHealthRecorder; if (rec != null) { rec.setCurrentSession(currentSession); rec.processDelayed(); } else { Log.w(LOGTAG, "Can't record session: rec is null."); } }- });+ }); } @Override public void onWindowFocusChanged(boolean hasFocus) { super.onWindowFocusChanged(hasFocus); if (!mInitialized && hasFocus) { initialize();@@ -1991,17 +1991,17 @@ public abstract class GeckoApp // In theory, the first browser session will not run long enough that we need to // prune during it and we'd rather run it when the browser is inactive so we wait // until here to register the prune service. GeckoPreferences.broadcastHealthReportPrune(context); } }); if (mAppStateListeners != null) {- for(GeckoAppShell.AppStateListener listener: mAppStateListeners) {+ for (GeckoAppShell.AppStateListener listener : mAppStateListeners) { listener.onPause(); } } super.onPause(); } @Override