From e96571d106a1c303ddc1d154c208ae0f7164627b Mon Sep 17 00:00:00 2001 From: Chien-Yu Chen Date: Tue, 10 Oct 2017 11:36:57 -0700 Subject: [PATCH] Revert "Revert "Settings: Enable HAL HDR+ by default"" This reverts commit 781e762c2c68027c6b4bf8bcb71979c5e8c595c3. Also updated the V2 version, which was not in the original revert CL. Test: CTS Bug: 67590972 Change-Id: I3c1459e432df10d075072e531ef6fc65e3ae4f24 --- .../development/CameraHalHdrPlusPreferenceControllerV2.java | 2 +- .../development/CameraHalHdrplusPreferenceController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java b/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java index cb03bfc0211..11ee6c78a15 100644 --- a/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java +++ b/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java @@ -95,6 +95,6 @@ public class CameraHalHdrPlusPreferenceControllerV2 extends } private boolean isHalHdrplusEnabled() { - return SystemProperties.getBoolean(PROPERTY_CAMERA_HAL_HDRPLUS, false /* default */); + return SystemProperties.getBoolean(PROPERTY_CAMERA_HAL_HDRPLUS, true /* default */); } } diff --git a/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java b/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java index 39b6db2e380..a5390ccec21 100644 --- a/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java +++ b/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java @@ -104,6 +104,6 @@ public class CameraHalHdrplusPreferenceController extends AbstractPreferenceCont } private boolean isHalHdrplusEnabled() { - return SystemProperties.getBoolean(PROPERTY_CAMERA_HAL_HDRPLUS, false); + return SystemProperties.getBoolean(PROPERTY_CAMERA_HAL_HDRPLUS, true); } }