commit 06f03e45b6adfa8aed9eca65aec6ed87dc1ca8f6
author Michael Kolb <kolby@google.com> Mon Dec 06 10:18:26 2010 -0800
committer Michael Kolb <kolby@google.com> Mon Dec 06 15:28:06 2010 -0800
tree 0ea74f1ce72fc8585fcb98c4480a659592d12c6e
parent 3a696280cba53eea153c9d5707b236997d193328

fix NPE in onDestroy

    Bug 3255996
    In case of a search we might exit the browser without ever creating a
    controller; added check to lifecycle methods.

Change-Id: I5fc358c31263ff63297a18944dce230f48886628

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 1c15153..7c0f7c8 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -130,7 +130,9 @@
         if (LOGV_ENABLED) {
             Log.v(LOGTAG, "BrowserActivity.onResume: this=" + this);
         }
-        mController.onResume();
+        if (mController != null) {
+            mController.onResume();
+        }
     }
 
     @Override
@@ -167,7 +169,9 @@
 
     @Override
     protected void onPause() {
-        mController.onPause();
+        if (mController != null) {
+            mController.onPause();
+        }
         super.onPause();
     }
 
@@ -177,7 +181,9 @@
             Log.v(LOGTAG, "BrowserActivity.onDestroy: this=" + this);
         }
         super.onDestroy();
-        mController.onDestroy();
+        if (mController != null) {
+            mController.onDestroy();
+        }
         mUi = null;
         mController = null;
     }