From aaa46baf1c12d63b16d3449f02341824f25589eb Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Sat, 22 Oct 2016 14:47:09 +0200
Subject: Snap: Fix possible NPE

Seems like getSupportedFocusModes() can return null.
Check for null before using it further

RM-290

Change-Id: I46860f780b99970cbe9857c8ba73691d69321488
Reference: BugDumps 20161014-20 L#131
---
 src/com/android/camera/PhotoModule.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index e12ffc5a2..33892ddba 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -4615,8 +4615,10 @@ public class PhotoModule
         mAeLockSupported = CameraUtil.isAutoExposureLockSupported(mInitialParams);
         mAwbLockSupported = CameraUtil.isAutoWhiteBalanceLockSupported(mInitialParams);
 
-        if (mInitialParams.getSupportedFocusModes().contains(CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE) ||
-            mInitialParams.getSupportedFocusModes().contains(CameraUtil.FOCUS_MODE_MW_CONTINUOUS_PICTURE)) {
+        List<String> focusModes = mInitialParams.getSupportedFocusModes();
+        if (focusModes != null &&
+                (focusModes.contains(CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE) ||
+                focusModes.contains(CameraUtil.FOCUS_MODE_MW_CONTINUOUS_PICTURE))) {
             mContinuousFocusSupported = true;
         } else {
             mContinuousFocusSupported = false;
-- 
cgit v1.2.3