summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Greiss <kufikugel@googlemail.com>2014-03-27 05:54:15 +0100
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2014-10-20 22:22:24 +0000
commite7c249ed95e855c6e2cfd2b666ff860c9a7a091c (patch)
tree3cc93df7b045e4a366b2dee3d98c157bd2cd72ab
parente8f977978e395def4bf0ab54502e75c716516195 (diff)
downloadandroid_packages_apps_Camera2-e7c249ed95e855c6e2cfd2b666ff860c9a7a091c.tar.gz
android_packages_apps_Camera2-e7c249ed95e855c6e2cfd2b666ff860c9a7a091c.tar.bz2
android_packages_apps_Camera2-e7c249ed95e855c6e2cfd2b666ff860c9a7a091c.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
-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 ed3f87e0c..2305ae6b2 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -283,7 +283,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);
}