summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@quicinc.com>2019-11-28 23:47:36 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-11-28 23:47:36 -0800
commitaaa8f10a91335e446d0beb3b14048e6eae3fe615 (patch)
tree6900017a5353133fd7baa3c7cd8be4c61538723b
parentd9e0f6e76b73c78206663dad6051dc2a5fe9f0ad (diff)
parentcb87d9529a0fcafbd5c86dc56ee88f212e8413a8 (diff)
downloadandroid_packages_apps_Snap-aaa8f10a91335e446d0beb3b14048e6eae3fe615.tar.gz
android_packages_apps_Snap-aaa8f10a91335e446d0beb3b14048e6eae3fe615.tar.bz2
android_packages_apps_Snap-aaa8f10a91335e446d0beb3b14048e6eae3fe615.zip
Merge "SnapdraongCamera: fix exception" into camera-SnapdragonCamera.lnx.2.0
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index d16f9ca96..bc01cbb7c 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2941,7 +2941,7 @@ public class CaptureModule implements CameraModule, PhotoController,
CaptureRequest.CONTROL_AF_MODE_OFF : afMode);
mTakingPicture[id] = false;
enableShutterAndVideoOnUiThread(id);
- } catch (NullPointerException | IllegalStateException | CameraAccessException e) {
+ } catch (NullPointerException | IllegalStateException | CameraAccessException | IllegalArgumentException e) {
Log.w(TAG, "Session is already closed");
}
}