diff options
| author | Jim Miller <jaggies@google.com> | 2011-10-20 19:24:02 -0700 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-10-21 18:00:03 +0800 |
| commit | 7d9eadd0c6c38b3761b7e8d3fa3658d194810d60 (patch) | |
| tree | 1257c2ff990199f74fec2aea92907718ccc72d00 /src/com/android/camera/Camera.java | |
| parent | cfc9bcc6dc56135d905ffdaaf1b9838cf12a1558 (diff) | |
| download | LegacyCamera-7d9eadd0c6c38b3761b7e8d3fa3658d194810d60.zip LegacyCamera-7d9eadd0c6c38b3761b7e8d3fa3658d194810d60.tar.gz LegacyCamera-7d9eadd0c6c38b3761b7e8d3fa3658d194810d60.tar.bz2 | |
Fix 5491362: don't open the camera in onResume in lockscreen.
Change-Id: I678dd23f1603647e801c339a557fc08b53dbfa38
Diffstat (limited to 'src/com/android/camera/Camera.java')
| -rw-r--r-- | src/com/android/camera/Camera.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 70f70c8..ecff831 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -135,7 +135,6 @@ public class Camera extends ActivityBase implements FocusManager.Listener, private static final String sTempCropFilename = "crop-temp"; - private android.hardware.Camera mCameraDevice; private ContentProviderClient mMediaProviderClient; private SurfaceHolder mSurfaceHolder = null; private ShutterButton mShutterButton; @@ -1441,11 +1440,11 @@ public class Camera extends ActivityBase implements FocusManager.Listener, } @Override - protected void onResume() { - super.onResume(); - mPausing = false; + protected void doOnResume() { if (mOpenCameraFail || mCameraDisabled) return; + mPausing = false; + mJpegPictureCallbackTime = 0; mZoomValue = 0; |