From ab90fb99ef3fb9e768d3e1118e49c803a5ccc46c Mon Sep 17 00:00:00 2001
From: dianlujitao <dianlujitao@lineageos.org>
Date: Thu, 21 Mar 2019 22:24:36 +0800
Subject: Snap: Fix picture size preference

 * Picture sizes are dynamically generated and no longer come with
   initial entries, thus reloadInitialEntriesAndEntryValues() would just
   set it to empty.

Change-Id: I4d601bdf0faf8065ada7ea252c9d6120a230a420
---
 src/com/android/camera/SettingsManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 6d7a44d2e..3d2c4658e 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -1247,7 +1247,9 @@ public class SettingsManager implements ListMenu.SettingsListener {
         String scene = getValue(SettingsManager.KEY_SCENE_MODE);
         ListPreference picturePref = mPreferenceGroup.findPreference(KEY_PICTURE_SIZE);
         if (picturePref == null) return;
-        picturePref.reloadInitialEntriesAndEntryValues();
+        CameraSettings.formatPictureSizes(picturePref,
+                getSupportedPictureSizeList(getCurrentCameraId()), mContext);
+        CameraSettings.resetIfInvalid(picturePref);
         if (Integer.parseInt(scene) == SCENE_MODE_CHROMAFLASH_INT) {
             if (filterUnsupportedOptions(picturePref, getSupportedChromaFlashPictureSize())) {
                 mFilteredKeys.add(picturePref.getKey());
-- 
cgit v1.2.3