diff options
| author | likaid <likaid@codeaurora.org> | 2015-04-21 13:35:35 +0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-07-30 05:05:25 -0700 |
| commit | eb60e2efbbae8d132ef610741c1160dd238bb1ac (patch) | |
| tree | a448bbba18c5891ee3c1531aa1f71382b9292e15 | |
| parent | 828954c631f980ce16e451a3f6b907f810cdf8d7 (diff) | |
| download | android_packages_apps_Snap-eb60e2efbbae8d132ef610741c1160dd238bb1ac.tar.gz android_packages_apps_Snap-eb60e2efbbae8d132ef610741c1160dd238bb1ac.tar.bz2 android_packages_apps_Snap-eb60e2efbbae8d132ef610741c1160dd238bb1ac.zip | |
SnapdragonCamera: Fix app crash when taking longshot during countdown
Cancel countdown capture when long press shutter button for longshot.
Change-Id: Ie33aba13139b0476085eb1f5256459f289d8af86
CRs-Fixed: 823502
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 8a091def1..bfa90c51c 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2256,6 +2256,10 @@ public class PhotoModule boolean enable = SystemProperties.getBoolean(PERSIST_LONG_SAVE, false); mLongshotSave = enable; + //Cancel the previous countdown when long press shutter button for longshot. + if (mUI.isCountingDown()) { + mUI.cancelCountDown(); + } //check whether current memory is enough for longshot. if(isLongshotNeedCancel()) { return; |