commit 151f74fca138df5d3c6f83b86e3b6e8d9748a7e3
author Alan Newberger <alann@google.com> Fri Jul 24 18:08:36 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 24 18:08:36 2015 +0000
tree cfa36da65347a8bd6e4ea696520b118e7e45585f
parent 1aaec6c024f7f2077590ea507fe70900c4889c48
parent 4df3011e2f3680a80ecc89c817ba528b2a578f0f

am 4df3011e: Protect against destroying uncreated values

* commit '4df3011e2f3680a80ecc89c817ba528b2a578f0f':
  Protect against destroying uncreated values

src/com/android/camera/CameraActivity.java

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 3997705..bf48898 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -2169,16 +2169,26 @@
             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);
     }