summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Greiss <kufikugel@googlemail.com>2014-03-27 05:54:15 +0100
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:22:25 -0700
commit35c5ffeddccbbccbb8fd902bf01aa65229e574f1 (patch)
tree600eb28d40dc85805f80b8f8ce0260508365fc63 /src
parent243f0b81b83068045ba425049db91810bbd0927b (diff)
downloadandroid_packages_apps_Snap-35c5ffeddccbbccbb8fd902bf01aa65229e574f1.tar.gz
android_packages_apps_Snap-35c5ffeddccbbccbb8fd902bf01aa65229e574f1.tar.bz2
android_packages_apps_Snap-35c5ffeddccbbccbb8fd902bf01aa65229e574f1.zip
Camera2: Don't report incorrect supported picture formats
If camera HAL does not return valid picture formats do not show wrong defaults Currently it falls back to jpeg and raw to choose for the user. All our devices which do not have a proper return of picture format only support jpg. So remove the entry to choose in this case completely Change-Id: Ib4e4094ba0a57e7751f6568f6ec3c3f1dfc1ffb8
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 211af84a8..7ce556f78 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -612,7 +612,7 @@ public class CameraSettings {
private List<String> getSupportedPictureFormatLists() {
String str = mParameters.get(KEY_QC_PICTURE_FORMAT);
if (str == null) {
- str = "jpeg,raw"; // if not set, fall back to default behavior
+ return null;
}
return split(str);
}