summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/panorama/PanoramaActivity.java
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2011-10-21 04:00:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-21 04:00:27 -0700
commitf5ba96adb5d72f9cac77ff21614f54e0d2bbb795 (patch)
treecd54b70c302d1075abe4d2109e3947d3dd351cff /src/com/android/camera/panorama/PanoramaActivity.java
parent57c4f8965fe9331235a777bd729745d1caf6347a (diff)
parent7d9eadd0c6c38b3761b7e8d3fa3658d194810d60 (diff)
downloadLegacyCamera-f5ba96adb5d72f9cac77ff21614f54e0d2bbb795.zip
LegacyCamera-f5ba96adb5d72f9cac77ff21614f54e0d2bbb795.tar.gz
LegacyCamera-f5ba96adb5d72f9cac77ff21614f54e0d2bbb795.tar.bz2
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.
Diffstat (limited to 'src/com/android/camera/panorama/PanoramaActivity.java')
-rwxr-xr-xsrc/com/android/camera/panorama/PanoramaActivity.java5
1 files changed, 1 insertions, 4 deletions
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();