diff options
author | Alan Newberger <alann@google.com> | 2015-07-24 18:08:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 18:08:36 +0000 |
commit | 151f74fca138df5d3c6f83b86e3b6e8d9748a7e3 (patch) | |
tree | cfa36da65347a8bd6e4ea696520b118e7e45585f /src | |
parent | 1aaec6c024f7f2077590ea507fe70900c4889c48 (diff) | |
parent | 4df3011e2f3680a80ecc89c817ba528b2a578f0f (diff) | |
download | android_packages_apps_Camera2-151f74fca138df5d3c6f83b86e3b6e8d9748a7e3.tar.gz android_packages_apps_Camera2-151f74fca138df5d3c6f83b86e3b6e8d9748a7e3.tar.bz2 android_packages_apps_Camera2-151f74fca138df5d3c6f83b86e3b6e8d9748a7e3.zip |
am 4df3011e: Protect against destroying uncreated values
* commit '4df3011e2f3680a80ecc89c817ba528b2a578f0f':
Protect against destroying uncreated values
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 3997705b3..bf4889873 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -2169,16 +2169,26 @@ public class CameraActivity extends QuickActivity mCameraController.removeCallbackReceiver(); mCameraController.setCameraExceptionHandler(null); } - getContentResolver().unregisterContentObserver(mLocalImagesObserver); - getContentResolver().unregisterContentObserver(mLocalVideosObserver); + if (mLocalImagesObserver != null) { + getContentResolver().unregisterContentObserver(mLocalImagesObserver); + } + if (mLocalVideosObserver != null) { + getContentResolver().unregisterContentObserver(mLocalVideosObserver); + } getServices().getCaptureSessionManager().removeSessionListener(mSessionListener); - mCameraAppUI.onDestroy(); - mModeListView.setVisibilityChangedListener(null); + if (mCameraAppUI != null) { + mCameraAppUI.onDestroy(); + } + if (mModeListView != null) { + mModeListView.setVisibilityChangedListener(null); + } mCameraController = null; mSettingsManager = null; mOrientationManager = null; mButtonManager = null; - mSoundPlayer.release(); + if (mSoundPlayer != null) { + mSoundPlayer.release(); + } CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1); CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.AUTO); } |