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

1 files changed, 17 insertions, 0 deletions

diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index e8ef589d7..0f1396a7d 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -215,6 +215,17 @@ public class WideAnglePanoramaModule
         }
     }
 
+    private int getPreferredCameraId(ComboPreferences preferences) {
+        int intentCameraId = CameraUtil.getCameraFacingIntentExtras(mActivity);
+        if (intentCameraId != -1) {
+            // Testing purpose. Launch a specific camera through the intent
+            // extras.
+            return intentCameraId;
+        } else {
+            return CameraSettings.readPreferredCameraId(preferences);
+        }
+    }
+
     @Override
     public void init(CameraActivity activity, View parent) {
         mActivity = activity;
@@ -291,6 +302,7 @@ public class WideAnglePanoramaModule
         mDialogWaitingPreviousString = appRes.getString(R.string.pano_dialog_waiting_previous);
 
         mPreferences = new ComboPreferences(mActivity);
+        mPreferences.setLocalId(mActivity, getPreferredCameraId(mPreferences));
         CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), activity);
         mLocationManager = new LocationManager(mActivity, null);
 
@@ -951,6 +963,10 @@ public class WideAnglePanoramaModule
     @Override
     public void onResumeBeforeSuper() {
         mPaused = false;
+        mPreferences = new ComboPreferences(mActivity);
+        CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), mActivity);
+        mPreferences.setLocalId(mActivity, getPreferredCameraId(mPreferences));
+        CameraSettings.upgradeLocalPreferences(mPreferences.getLocal());
     }
 
     @Override
@@ -992,6 +1008,7 @@ public class WideAnglePanoramaModule
                 }
             });
         }
+        mUI.setSwitcherIndex();
         keepScreenOnAwhile();
 
         mOrientationManager.resume();