commit b5fd1162998b37b47aceff431992f484e422d03f
author Nick Pelly <npelly@google.com> Tue Aug 23 18:46:34 2011 -0700
committer Nick Pelly <npelly@google.com> Thu Aug 25 22:00:02 2011 -0700
tree c7293742885d4cd8ff727c11392626faf525c298
parent 87357644efd5940876deb29820d3049bc9c6b13a

Updates for NDEF push API change.

Change-Id: I2390665d59f6b3868b5a3a27bfc38ea4c9cdf0d4

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 7192f3f..92cb743 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -157,7 +157,6 @@
     private IntentHandler mIntentHandler;
     private PageDialogsHandler mPageDialogsHandler;
     private NetworkStateHandler mNetworkHandler;
-    private NfcHandler mNfcHandler;
 
     private Message mAutoFillSetupMessage;
 
@@ -228,7 +227,6 @@
         mUrlHandler = new UrlHandler(this);
         mIntentHandler = new IntentHandler(mActivity, this);
         mPageDialogsHandler = new PageDialogsHandler(mActivity, this);
-        mNfcHandler = new NfcHandler(mActivity, this);
 
         startHandler();
         mBookmarksObserver = new ContentObserver(mHandler) {
@@ -255,6 +253,8 @@
     }
 
     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);
@@ -632,7 +632,6 @@
         }
         mUi.onPause();
         mNetworkHandler.onPause();
-        mNfcHandler.onPause();
 
         WebView.disablePlatformNotifications();
     }
@@ -667,7 +666,6 @@
 
         mUi.onResume();
         mNetworkHandler.onResume();
-        mNfcHandler.onResume();
         WebView.enablePlatformNotifications();
     }