summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-09-24 19:52:23 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-09-24 19:52:23 -0700
commit677b578500318352ceadc7c22336c93b20db643c (patch)
tree2aae7f18faea6d1b6d69c054c6ce032bc62c84a6
parent2f4135c1b887adfcd720da8aa8fe47845f2a3f15 (diff)
parentdb77993f39061896a7114439d377f3dd95f95875 (diff)
downloadandroid_packages_apps_Snap-677b578500318352ceadc7c22336c93b20db643c.tar.gz
android_packages_apps_Snap-677b578500318352ceadc7c22336c93b20db643c.tar.bz2
android_packages_apps_Snap-677b578500318352ceadc7c22336c93b20db643c.zip
Merge "SnapdragonCamera:Fix NP" into camera-SnapdragonCamera.lnx.2.0
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index c8d20c5c1..31f85787c 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -4689,6 +4689,8 @@ public class CaptureModule implements CameraModule, PhotoController,
e.printStackTrace();
} catch (IllegalStateException e) {
e.printStackTrace();
+ } catch (NullPointerException e) {
+ e.printStackTrace();
}
}