diff options
| author | Arne Coucheron <arco68@gmail.com> | 2016-09-08 01:43:29 +0200 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2016-09-08 01:57:11 +0200 |
| commit | cef0045f3c2fb06543be8cdccf6e42364b997ace (patch) | |
| tree | 94d344a10bd32bc98873dd75ad315a7739cbc6ef | |
| parent | f676403bb5603f9d2a25388070903b98a2a75028 (diff) | |
| download | android_packages_apps_Snap-cef0045f3c2fb06543be8cdccf6e42364b997ace.tar.gz android_packages_apps_Snap-cef0045f3c2fb06543be8cdccf6e42364b997ace.tar.bz2 android_packages_apps_Snap-cef0045f3c2fb06543be8cdccf6e42364b997ace.zip | |
camera2: Fix mismerge
Change-Id: Ic367b36a48d9738ca16b193a1576235b1115df19
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index fffd016fe..c4cd4014a 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); |