summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Coucheron <arco68@gmail.com>2016-09-08 01:43:29 +0200
committerArne Coucheron <arco68@gmail.com>2016-09-08 01:57:11 +0200
commitcef0045f3c2fb06543be8cdccf6e42364b997ace (patch)
tree94d344a10bd32bc98873dd75ad315a7739cbc6ef
parentf676403bb5603f9d2a25388070903b98a2a75028 (diff)
downloadandroid_packages_apps_Snap-cef0045f3c2fb06543be8cdccf6e42364b997ace.zip
android_packages_apps_Snap-cef0045f3c2fb06543be8cdccf6e42364b997ace.tar.gz
android_packages_apps_Snap-cef0045f3c2fb06543be8cdccf6e42364b997ace.tar.bz2
camera2: Fix mismerge
Change-Id: Ic367b36a48d9738ca16b193a1576235b1115df19
-rw-r--r--src/com/android/camera/CameraActivity.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index fffd016..c4cd401 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1825,7 +1825,10 @@ public class CameraActivity extends Activity
mWakeLock.release();
Log.d(TAG, "wake lock release");
}
- SettingsManager.getInstance().destroyInstance();
+ SettingsManager settingsMngr = SettingsManager.getInstance();
+ if (settingsMngr != null) {
+ settingsMngr.destroyInstance();
+ }
if (mCursor != null) {
if (mSecureCamera) {
unregisterReceiver(mScreenOffReceiver);