diff options
| author | Kerong Sui <ksui@codeaurora.org> | 2013-10-08 16:20:06 +0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-11-10 07:55:48 -0800 |
| commit | 9ed45b46de12400a6262436de7d99823d061a401 (patch) | |
| tree | 5db4edcd589dd288cabdc98621cd9a2922e82d20 | |
| parent | 9e27b971c0491c687b0aab631233c575d13a7a79 (diff) | |
| download | android_packages_apps_Gallery2-9ed45b46de12400a6262436de7d99823d061a401.tar.gz android_packages_apps_Gallery2-9ed45b46de12400a6262436de7d99823d061a401.tar.bz2 android_packages_apps_Gallery2-9ed45b46de12400a6262436de7d99823d061a401.zip | |
Camera: Skip switch camera command when camera state is busy
Check camera state before execute switch camera command to avoid
camera issue.
CRs-fixed: 552026
Change-Id: I301f2a135ba873b1370d709d1251f88711bac8cb
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index d95844df4..3792b78c1 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2206,7 +2206,10 @@ public class PhotoModule @Override public void onCameraPickerClicked(int cameraId) { - if (mPaused || mPendingSwitchCameraId != -1) return; + if (mPaused || mPendingSwitchCameraId != -1 + || mCameraState != IDLE) { + return; + } mPendingSwitchCameraId = cameraId; if (ApiHelper.HAS_SURFACE_TEXTURE) { |