diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-30 10:12:41 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-30 10:12:41 -0800 |
| commit | 249b9b7e60eeaa828bead99f42e37c451ef79848 (patch) | |
| tree | 23cf15ee6ef8ce7229092d5254e00141aa74c90f /src | |
| parent | 932b83f5c355a43f4605b9826c39b05af07f6892 (diff) | |
| parent | 73de2f88c091988ea19d3ce2b981ed2b4fefe55c (diff) | |
| download | android_packages_apps_Snap-249b9b7e60eeaa828bead99f42e37c451ef79848.tar.gz android_packages_apps_Snap-249b9b7e60eeaa828bead99f42e37c451ef79848.tar.bz2 android_packages_apps_Snap-249b9b7e60eeaa828bead99f42e37c451ef79848.zip | |
Merge "Fix UI unnormal after snapshot failed." into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 08b533e04..cf2983def 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1936,7 +1936,7 @@ public class CaptureModule implements CameraModule, PhotoController, private void parallelLockFocusExposure(int id) { if (mActivity == null || mCameraDevice[id] == null || !checkSessionAndBuilder(mCaptureSession[id], mPreviewRequestBuilder[id])) { - mUI.enableShutter(true); + enableShutterAndVideoOnUiThread(id); warningToast("Camera is not ready yet to take a picture."); return; } @@ -2011,7 +2011,7 @@ public class CaptureModule implements CameraModule, PhotoController, private void lockFocus(int id) { if (mActivity == null || mCameraDevice[id] == null || !checkSessionAndBuilder(mCaptureSession[id], mPreviewRequestBuilder[id])) { - mUI.enableShutter(true); + enableShutterAndVideoOnUiThread(id); warningToast("Camera is not ready yet to take a picture."); return; } @@ -2134,7 +2134,7 @@ public class CaptureModule implements CameraModule, PhotoController, try { if (null == mActivity || null == mCameraDevice[id] || !checkSessionAndBuilder(mCaptureSession[id], mPreviewRequestBuilder[id])) { - mUI.enableShutter(true); + enableShutterAndVideoOnUiThread(id); mLongshotActive = false; warningToast("Camera is not ready yet to take a picture."); return; |