summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Greiss <kufikugel@googlemail.com>2014-03-27 05:54:15 +0100
committerMichael Bestas <mikeioannina@gmail.com>2015-09-17 23:26:02 +0300
commit9d7f74dc0fa71e07e283449cf3ec82360ed39dde (patch)
tree8dc5a115fd8fddac5a95b323d3b5f73dfa879a44
parentbd61c03ea0b5fbe04d99f35a8f711a0166b90467 (diff)
downloadandroid_packages_apps_Snap-9d7f74dc0fa71e07e283449cf3ec82360ed39dde.zip
android_packages_apps_Snap-9d7f74dc0fa71e07e283449cf3ec82360ed39dde.tar.gz
android_packages_apps_Snap-9d7f74dc0fa71e07e283449cf3ec82360ed39dde.tar.bz2
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 c14f019..a464217 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -529,7 +529,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);
}