From 7d9eadd0c6c38b3761b7e8d3fa3658d194810d60 Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Thu, 20 Oct 2011 19:24:02 -0700
Subject: Fix 5491362: don't open the camera in onResume in lockscreen.

Change-Id: I678dd23f1603647e801c339a557fc08b53dbfa38
---
 src/com/android/camera/panorama/PanoramaActivity.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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

diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index 0e055e5..43d33a8 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;
@@ -916,9 +915,7 @@ public class PanoramaActivity extends ActivityBase implements
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
-
+    protected void doOnResume() {
         mPausing = false;
         mOrientationEventListener.enable();
 
-- 
cgit v1.1