From 2df470fb509b0f03ea6b541c7f2e144db516444a Mon Sep 17 00:00:00 2001
From: Byunghun Jeon <bjeon@codeaurora.org>
Date: Tue, 7 Jun 2016 14:23:31 -0700
Subject: SnapdragonCamera: Filter duplicate picture resolution

Filter picture resolution with duplicate name.
There can be 2 different picture resolutions with the same name.
Take only the first one.

Change-Id: I9a472d958b829d3dce9559d4fcacb5d0dfd3e598
CRs-Fixed: 1025767
---
 src/com/android/camera/CameraSettings.java  | 2 +-
 src/com/android/camera/SettingsManager.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index e7e3c0e3a..6d8778bcc 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -1129,7 +1129,7 @@ public class CameraSettings {
         resetIfInvalid(pref);
     }
 
-    private void filterSimilarPictureSize(PreferenceGroup group,
+    public static void filterSimilarPictureSize(PreferenceGroup group,
             ListPreference pref) {
         pref.filterDuplicated();
         if (pref.getEntries().length <= 1) {
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 3a5f6f705..095c5d8d5 100644
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -518,6 +518,7 @@ public class SettingsManager implements ListMenu.SettingsListener {
         if (pictureSize != null) {
             CameraSettings.filterUnsupportedOptions(mPreferenceGroup,
                     pictureSize, getSupportedPictureSize(cameraId));
+            CameraSettings.filterSimilarPictureSize(mPreferenceGroup, pictureSize);
         }
 
         if (exposure != null) buildExposureCompensation(cameraId);
-- 
cgit v1.2.3