From fb0b5768fe80e4c8a50642965662682850efd14c Mon Sep 17 00:00:00 2001
From: Jay Wang <jaywang@codeaurora.org>
Date: Wed, 15 Jun 2016 14:04:34 -0700
Subject: SnapdragonCamera: Multiple fixes in SettingManager

- Setting manager instance was not destroyed when camera activity
onDestroy is called and a new instance is created again when
onCreate is called. Make change to destroy the setting manager
during onDestroy.

- Include high resolution picture sizes to the picture size
list

Change-Id: Id6cb52da1419f7e723304236b5d2c204d217398c
CRs-Fixed: 1025845, 1025789
---
 src/com/android/camera/CameraActivity.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/com/android/camera/CameraActivity.java')

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index f5d99a65a..525288370 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1824,6 +1824,7 @@ public class CameraActivity extends Activity
             mWakeLock.release();
             Log.d(TAG, "wake lock release");
         }
+        SettingsManager.getInstance().destroyInstance();
         if (mCursor != null) {
             if (mSecureCamera) {
                 unregisterReceiver(mScreenOffReceiver);
-- 
cgit v1.2.3