commit 5557aba0dd9310a26c5a787d338f41d9510a2665
author Pankaj Garg <pgarg@codeaurora.org> Sat Mar 19 16:07:14 2016 +0100
committer jrizzoli <joey@cyanogenmoditalia.it> Sat Mar 19 16:07:14 2016 +0100
tree 0d124e5e4e52cf6541374830e354b02851676b3d
parent 24a375a8f086add50ce1f8a1dcf3562900c9b17f

Fix browser crash on device reboot

- Added null pointer check in onDestroy() of browser controller.
  Some listeners might be null when those are unregistered.

Change-Id: Iabbfdc11a29fb7144b9f3e5a3cafc3c5c073addc
CR-Fixes: 985342

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index d8953a2..d70f585 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -807,7 +807,8 @@
         mUi.onPause();
         mNetworkHandler.onPause();
         NfcHandler.unregister(mActivity);
-        mActivity.unregisterReceiver(mLowPowerReceiver);
+        if (mLowPowerReceiver != null)
+            mActivity.unregisterReceiver(mLowPowerReceiver);
     }
 
     @Override
@@ -884,7 +885,8 @@
         // Destroy all the tabs
         mTabControl.destroy();
         // Unregister receiver
-        mActivity.unregisterReceiver(mPowerChangeReceiver);
+        if (mPowerChangeReceiver != null)
+            mActivity.unregisterReceiver(mPowerChangeReceiver);
     }
 
     protected boolean isActivityPaused() {