diff options
author | Chih-Chung Chang <chihchung@google.com> | 2009-06-11 14:27:57 +0800 |
---|---|---|
committer | Chih-Chung Chang <chihchung@google.com> | 2009-06-11 14:28:30 +0800 |
commit | 5075f53df86f3dcb0a46fd6353057260ad480f43 (patch) | |
tree | 23d9e7727f95a9a11af1d6c6dac75f5e895c597f /src/com/android | |
parent | f51ec3a8294aa7bf331d9bf21690de23afa86b6f (diff) | |
download | LegacyCamera-5075f53df86f3dcb0a46fd6353057260ad480f43.zip LegacyCamera-5075f53df86f3dcb0a46fd6353057260ad480f43.tar.gz LegacyCamera-5075f53df86f3dcb0a46fd6353057260ad480f43.tar.bz2 |
Fix 1909891. Allow keep() to be called without open().
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/camera/CameraHolder.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraHolder.java b/src/com/android/camera/CameraHolder.java index 09b6b55..b85aefb 100644 --- a/src/com/android/camera/CameraHolder.java +++ b/src/com/android/camera/CameraHolder.java @@ -97,7 +97,10 @@ public class CameraHolder { } public synchronized void keep() { - Assert(users == 1); + // We allow (users == 0) for the convenience of the calling activity. + // The activity may not have a chance to call open() before the user + // choose the menu item to switch to another activity. + Assert(users == 1 || users == 0); // Keep the camera instance for 3 seconds. keepBeforeTime = System.currentTimeMillis() + 3000; } |