summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/Camera.java
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2011-09-29 01:19:59 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-29 01:19:59 -0700
commit10bc9cb3578d877c8e3eb944e0c4282b1ba1b0c6 (patch)
tree4507bb6743b49458e875376ae2ef7fd9fb878d21 /src/com/android/camera/Camera.java
parentffe0a712b5a9bd1d46351b02e1bd738bc61578c2 (diff)
parent46f4430b50ba8ca8b04b698d45d9ca2d4513121d (diff)
downloadpackages_apps_LegacyCamera-10bc9cb3578d877c8e3eb944e0c4282b1ba1b0c6.zip
packages_apps_LegacyCamera-10bc9cb3578d877c8e3eb944e0c4282b1ba1b0c6.tar.gz
packages_apps_LegacyCamera-10bc9cb3578d877c8e3eb944e0c4282b1ba1b0c6.tar.bz2
Merge "Fix ModePicker selection UI."
Diffstat (limited to 'src/com/android/camera/Camera.java')
-rw-r--r--src/com/android/camera/Camera.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index dc4d45d..bd3c7b8 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1849,7 +1849,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
}
private boolean switchToOtherMode(int mode) {
- if (isFinishing() || !isCameraIdle()) return false;
+ if (isFinishing()) return false;
MenuHelper.gotoMode(mode, Camera.this);
mHandler.removeMessages(FIRST_TIME_INIT);
finish();