From c724bc35a9c5f3b36ce36a2081559e2644993da4 Mon Sep 17 00:00:00 2001
From: xianming wang <mingwax@codeaurora.org>
Date: Tue, 12 Feb 2019 17:41:20 +0800
Subject: SnapdragonCamera: Add get AE/AF state in onCaptureProgressed

(1) Add get AE/AF state in onCaptureProgressed(partial meta).
(2) Fix NullPointerException when mPreferenceGroup is NULL.

CRs-Fixed: 2401109
Change-Id: I2c2828d9a6d93c50457eb1d1a35f3dbd0e08ff4d
---
 src/com/android/camera/CaptureModule.java   |  1 +
 src/com/android/camera/SettingsManager.java | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 213c44ce2..84b08c9d3 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -794,6 +794,7 @@ public class CaptureModule implements CameraModule, PhotoController,
                     updateFaceView(faces, null);
                 }
             }
+            updateCaptureStateMachine(id, partialResult);
         }
 
         @Override
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 0856beb29..5cac5cba8 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -757,18 +757,19 @@ public class SettingsManager implements ListMenu.SettingsListener {
     }
 
     public boolean setValue(String key, String value) {
-        ListPreference pref = mPreferenceGroup.findPreference(key);
-        if (pref != null) {
-            if (pref.findIndexOfValue(value) < 0) {
-                return false;
-            } else {
-                pref.setValue(value);
-                updateMapAndNotify(pref);
-                return true;
+        if (mPreferenceGroup != null) {
+            ListPreference pref = mPreferenceGroup.findPreference(key);
+            if (pref != null) {
+                if (pref.findIndexOfValue(value) < 0) {
+                    return false;
+                } else {
+                    pref.setValue(value);
+                    updateMapAndNotify(pref);
+                    return true;
+                }
             }
-        } else {
-            return false;
         }
+        return false;
     }
 
     public boolean setValue(String key, Set<String> set) {
-- 
cgit v1.2.3