summaryrefslogtreecommitdiff
path: root/src/com/android/browser/Controller.java
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-09-01 23:45:31 +0100
committerBen Murdoch <benm@google.com>2011-09-02 00:22:39 +0100
commit015e1e3145ac284aa5879c973f9d2381c8cd48fe (patch)
treec8d06c8d76fea2bdbafe5700bdfeaf842fe54635 /src/com/android/browser/Controller.java
parentafe66e21cc7b8724b2ff653e0786198bf2a24aca (diff)
Unregister the NFC callback onPause.
This prevents us from leaking BrowserActivity when we go to the background. Bug: 5233864 Change-Id: Idf59de67637c8c9eb39ea9f8b9cb93320c4afa99
Diffstat (limited to 'src/com/android/browser/Controller.java')
-rw-r--r--src/com/android/browser/Controller.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index adc26778..ff1ad0ea 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -253,8 +253,6 @@ public class Controller
}
void start(final Bundle icicle, final Intent intent) {
- NfcHandler.register(mActivity, this);
-
boolean noCrashRecovery = intent.getBooleanExtra(NO_CRASH_RECOVERY, false);
if (icicle != null || noCrashRecovery) {
doStart(icicle, intent);
@@ -637,6 +635,7 @@ public class Controller
mNetworkHandler.onPause();
WebView.disablePlatformNotifications();
+ NfcHandler.unregister(mActivity);
}
void onSaveInstanceState(Bundle outState) {
@@ -670,6 +669,7 @@ public class Controller
mUi.onResume();
mNetworkHandler.onResume();
WebView.enablePlatformNotifications();
+ NfcHandler.register(mActivity, this);
}
private void releaseWakeLock() {