summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/SettingsManager.java
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-11-02 23:34:06 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-11-02 23:34:06 -0700
commit44f769c74b09f2b0413a6b2af8ad555ee66af200 (patch)
treeea429ab958d8e95d94beb37521085a078df23652 /src/com/android/camera/SettingsManager.java
parenta90e7199a3b299fd09557de73440d9890eea8298 (diff)
parent7171f2fe7d1290a347210052fb424beb1e8a179e (diff)
downloadandroid_packages_apps_Snap-44f769c74b09f2b0413a6b2af8ad555ee66af200.tar.gz
android_packages_apps_Snap-44f769c74b09f2b0413a6b2af8ad555ee66af200.tar.bz2
android_packages_apps_Snap-44f769c74b09f2b0413a6b2af8ad555ee66af200.zip
Merge "SnapdragonCamera: Fix settingmanager redeye filtering bug" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/SettingsManager.java')
-rw-r--r--src/com/android/camera/SettingsManager.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index c98bb8813..e076b3824 100644
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -620,12 +620,6 @@ public class SettingsManager implements ListMenu.SettingsListener {
mVideoQualityEntries = videoQuality.getEntries();
}
- if (iso != null) {
- if (filterUnsupportedOptions(videoQuality, getSupportedVideoSize(cameraId))) {
- mFilteredKeys.add(redeyeReduction.getKey());
- }
- }
-
if (!mIsMonoCameraPresent) {
if (clearsight != null) removePreference(mPreferenceGroup, KEY_CLEARSIGHT);
if (monoPreview != null) removePreference(mPreferenceGroup, KEY_MONO_PREVIEW);