diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2009-05-20 10:34:46 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2009-05-20 11:14:51 +0800 |
| commit | f0666590162507e8b372b32c55dca3835392196a (patch) | |
| tree | abb03111d6f9c025770e9bec687f94406e35bf91 /src/com/android | |
| parent | 724e9b3db93677b753c1267a716e30e6cf5ff3b6 (diff) | |
| download | LegacyCamera-f0666590162507e8b372b32c55dca3835392196a.zip LegacyCamera-f0666590162507e8b372b32c55dca3835392196a.tar.gz LegacyCamera-f0666590162507e8b372b32c55dca3835392196a.tar.bz2 | |
Fix crash seen in monkey run.
We should not call restartPreview in onPause.
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/camera/Camera.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 3caf536..f21571a 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1079,8 +1079,6 @@ public class Camera extends Activity implements View.OnClickListener, @Override protected void onPause() { - keep(); - mPausing = true; stopPreview(); // Close the camera now because other activities may need to use it. @@ -1502,12 +1500,6 @@ public class Camera extends Activity implements View.OnClickListener, } } - void keep() { - if (mCaptureObject != null) { - mCaptureObject.dismissFreezeFrame(); - } - } - private void startReceivingLocationUpdates() { if (mLocationManager != null) { try { @@ -1567,7 +1559,6 @@ public class Camera extends Activity implements View.OnClickListener, // save the image if we presented the "advanced" menu // which happens if "menu" is pressed while in // SNAPSHOT_IN_PROGRESS or SNAPSHOT_COMPLETED modes - keep(); mHandler.sendEmptyMessage(RESTART_PREVIEW); } } |