diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2016-01-27 17:09:15 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-05-26 09:48:45 -0700 |
| commit | 02fa4483a6536b19ee49a5f98d30a3fa03eae72d (patch) | |
| tree | c0afa86098ffd2f7f1452de45d092141cd66157a /src/com/android/camera/PhotoModule.java | |
| parent | 94574eb97d43e17d0f2a115370f0f767f4c6049c (diff) | |
| download | android_packages_apps_Snap-02fa4483a6536b19ee49a5f98d30a3fa03eae72d.tar.gz android_packages_apps_Snap-02fa4483a6536b19ee49a5f98d30a3fa03eae72d.tar.bz2 android_packages_apps_Snap-02fa4483a6536b19ee49a5f98d30a3fa03eae72d.zip | |
SnapdragonCamera: Fix the memory leak on view.
Keep using modules instead of creating.
Don't remove the view without cleaning it.
Change-Id: I260a660cac3d770f7d02dfdc1881e15490da66a0
CRs-Fixed: 958510
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 67c2325f6..c2d00b562 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2288,6 +2288,11 @@ public class PhotoModule @Override public void onResumeBeforeSuper() { mPaused = false; + mPreferences = new ComboPreferences(mActivity); + CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), mActivity); + mCameraId = getPreferredCameraId(mPreferences); + mPreferences.setLocalId(mActivity, mCameraId); + CameraSettings.upgradeLocalPreferences(mPreferences.getLocal()); } private void openCamera() { @@ -2334,6 +2339,7 @@ public class PhotoModule Log.v(TAG, "On resume."); onResumeTasks(); } + mUI.setSwitcherIndex(); mHandler.post(new Runnable(){ @Override public void run(){ @@ -3021,6 +3027,7 @@ public class PhotoModule if (CameraUtil.isSupported(colorEffect, mParameters.getSupportedColorEffects())) { mParameters.setColorEffect(colorEffect); } + //Set Saturation String saturationStr = getSaturationSafe(); if (saturationStr != null) { |