summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/SettingsManager.java
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-09-24 21:26:24 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-09-24 21:26:24 -0700
commit7e96681d6c4e4f96e1a509ca8d971f67e4205e03 (patch)
treefd1642799fc88a9e13626490dd0a9edd49801e43 /src/com/android/camera/SettingsManager.java
parent0b7251baa132e5a8a5ec1795dc20c09bd137658d (diff)
parent4da95671869fe62b400762282e459350f7ea2147 (diff)
downloadandroid_packages_apps_Snap-7e96681d6c4e4f96e1a509ca8d971f67e4205e03.tar.gz
android_packages_apps_Snap-7e96681d6c4e4f96e1a509ca8d971f67e4205e03.tar.bz2
android_packages_apps_Snap-7e96681d6c4e4f96e1a509ca8d971f67e4205e03.zip
Merge "Fix flash icon error" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src/com/android/camera/SettingsManager.java')
-rwxr-xr-xsrc/com/android/camera/SettingsManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 5ccf8002b..86df469f3 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -740,6 +740,7 @@ public class SettingsManager implements ListMenu.SettingsListener {
if (flashMode != null) {
if (!isFlashAvailable(mCameraId)) {
removePreference(mPreferenceGroup, KEY_FLASH_MODE);
+ removePreference(mPreferenceGroup, KEY_VIDEO_FLASH_MODE);
mFilteredKeys.add(flashMode.getKey());
}
}