From 5745350be1522fed1d16bdca218227c749f4ddd9 Mon Sep 17 00:00:00 2001 From: Brandon McAnsh Date: Wed, 14 Sep 2016 10:54:21 -0400 Subject: Snap: SettingsManager: Properly assert CameraCharacteristics.LENS_FACING value Change-Id: Id4e94e926cfb5a5185227789762269b594537e85 Signed-off-by: Brandon McAnsh --- src/com/android/camera/SettingsManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 1380a5e08..3c3f90d87 100644 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -146,8 +146,9 @@ public class SettingsManager implements ListMenu.SettingsListener { CaptureModule.MONO_ID = i; mIsMonoCameraPresent = true; } - int facing = characteristics.get(CameraCharacteristics.LENS_FACING); - if (facing == CameraCharacteristics.LENS_FACING_FRONT) { + Integer facing = characteristics.get(CameraCharacteristics.LENS_FACING); + if (facing != null && + facing.intValue() == CameraCharacteristics.LENS_FACING_FRONT) { CaptureModule.FRONT_ID = i; mIsFrontCameraPresent = true; } -- cgit v1.2.3