am 7d9eadd0: Fix 5491362: don\'t open the camera in onResume in lockscreen.

* commit '7d9eadd0c6c38b3761b7e8d3fa3658d194810d60':
  Fix 5491362: don't open the camera in onResume in lockscreen.

2 files changed, 5 insertions, 6 deletions

diff --git a/src/com/android/camera/panorama/MosaicFrameProcessor.java b/src/com/android/camera/panorama/MosaicFrameProcessor.java
index 300e4e3..6c70b19 100644
--- a/src/com/android/camera/panorama/MosaicFrameProcessor.java
+++ b/src/com/android/camera/panorama/MosaicFrameProcessor.java
@@ -91,8 +91,10 @@ public class MosaicFrameProcessor {
     }
 
     public void clear() {
-        mIsMosaicMemoryAllocated = false;
-        mMosaicer.freeMosaicMemory();
+        if (mIsMosaicMemoryAllocated) {
+            mIsMosaicMemoryAllocated = false;
+            mMosaicer.freeMosaicMemory();
+        }
     }
 
     public void setStripType(int type) {
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index 592b9c3..6fd9b1a 100755
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -144,7 +144,6 @@ public class PanoramaActivity extends ActivityBase implements
 
     private int mPreviewWidth;
     private int mPreviewHeight;
-    private Camera mCameraDevice;
     private int mCameraState;
     private int mCaptureState;
     private SensorManager mSensorManager;
@@ -918,9 +917,7 @@ public class PanoramaActivity extends ActivityBase implements
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
-
+    protected void doOnResume() {
         mPausing = false;
         mOrientationEventListener.enable();