diff options
| author | Pankaj Garg <pgarg@codeaurora.org> | 2016-03-19 16:07:14 +0100 |
|---|---|---|
| committer | jrizzoli <joey@cyanogenmoditalia.it> | 2016-03-19 16:07:14 +0100 |
| commit | 5557aba0dd9310a26c5a787d338f41d9510a2665 (patch) | |
| tree | 0d124e5e4e52cf6541374830e354b02851676b3d | |
| parent | 24a375a8f086add50ce1f8a1dcf3562900c9b17f (diff) | |
| download | android_packages_apps_Gello-5557aba0dd9310a26c5a787d338f41d9510a2665.tar.gz android_packages_apps_Gello-5557aba0dd9310a26c5a787d338f41d9510a2665.tar.bz2 android_packages_apps_Gello-5557aba0dd9310a26c5a787d338f41d9510a2665.zip | |
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
| -rw-r--r-- | src/com/android/browser/Controller.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index d8953a25..d70f5856 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -807,7 +807,8 @@ public class Controller mUi.onPause(); mNetworkHandler.onPause(); NfcHandler.unregister(mActivity); - mActivity.unregisterReceiver(mLowPowerReceiver); + if (mLowPowerReceiver != null) + mActivity.unregisterReceiver(mLowPowerReceiver); } @Override @@ -884,7 +885,8 @@ public class Controller // Destroy all the tabs mTabControl.destroy(); // Unregister receiver - mActivity.unregisterReceiver(mPowerChangeReceiver); + if (mPowerChangeReceiver != null) + mActivity.unregisterReceiver(mPowerChangeReceiver); } protected boolean isActivityPaused() { |