summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
diff options
context:
space:
mode:
authorJay Wang <jaywang@codeaurora.org>2016-06-15 14:04:34 -0700
committerSteve Kondik <steve@cyngn.com>2016-08-25 21:55:20 -0700
commitfb0b5768fe80e4c8a50642965662682850efd14c (patch)
treeea31b2a35d89327c2ea4f5d76518c5f5976a03c2 /src/com/android/camera/CameraActivity.java
parentdf76934a0d48c3ef505d646f1ae7e6a208035714 (diff)
downloadandroid_packages_apps_Snap-fb0b5768fe80e4c8a50642965662682850efd14c.tar.gz
android_packages_apps_Snap-fb0b5768fe80e4c8a50642965662682850efd14c.tar.bz2
android_packages_apps_Snap-fb0b5768fe80e4c8a50642965662682850efd14c.zip
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
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r--src/com/android/camera/CameraActivity.java1
1 files changed, 1 insertions, 0 deletions
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);