diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-05-16 00:35:07 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-05-16 00:35:07 -0700 |
| commit | 4a0ffc25d1249ee3ca217b1ab8021cd9318cf90f (patch) | |
| tree | 3aa1cdcfbdd21df43c128b2eb477ff3bf71cfcd8 /src | |
| parent | a73f5b0ccc23ea9dfc232db85f179c8a6a66bbca (diff) | |
| parent | 9e10f5934b50cf62c9c639021cf9b0595aa3b336 (diff) | |
| download | android_packages_apps_Snap-4a0ffc25d1249ee3ca217b1ab8021cd9318cf90f.tar.gz android_packages_apps_Snap-4a0ffc25d1249ee3ca217b1ab8021cd9318cf90f.tar.bz2 android_packages_apps_Snap-4a0ffc25d1249ee3ca217b1ab8021cd9318cf90f.zip | |
Merge "Camera: Update JPEG picture format to HAL when ZSL mode is turned on"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 708929907..01bbf33ae 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2492,6 +2492,7 @@ public class PhotoModule mFocusManager.setZslEnable(true); //Raw picture format is not supported under ZSL mode + mParameters.set(KEY_PICTURE_FORMAT, PIXEL_FORMAT_JPEG); Editor editor = mPreferences.edit(); editor.putString(CameraSettings.KEY_PICTURE_FORMAT, mActivity.getString(R.string.pref_camera_picture_format_value_jpeg)); editor.apply(); |