From 4d26fa03a896b3aca3ce961d07c2b1334d9a9d24 Mon Sep 17 00:00:00 2001 From: Chien-Yu Chen Date: Wed, 27 Sep 2017 11:38:15 -0700 Subject: [PATCH] Settings: Show HAL HDR+ option in user build Test: CameraHalHdrplusPreferenceControllerTest Bug: 66919557 Change-Id: I02e89d34db56398e64e12616f34b8584df25c48b --- .../CameraHalHdrplusPreferenceController.java | 4 +-- ...eraHalHdrplusPreferenceControllerTest.java | 35 ------------------- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java b/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java index e8e2c2d8da1..84836bc9bbc 100644 --- a/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java +++ b/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java @@ -63,9 +63,7 @@ public class CameraHalHdrplusPreferenceController extends AbstractPreferenceCont @Override public boolean isAvailable() { - return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus) && - (SystemProperties.get(BUILD_TYPE).equals("userdebug") || - SystemProperties.get(BUILD_TYPE).equals("eng")); + return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus); } @Override diff --git a/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java index d218434dbd9..f5ef38fef60 100644 --- a/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java @@ -53,8 +53,6 @@ public class CameraHalHdrplusPreferenceControllerTest { private SwitchPreference mPreference; static final String USERDEBUG_BUILD = "userdebug"; - static final String ENG_BUILD = "eng"; - static final String USER_BUILD = "user"; private CameraHalHdrplusPreferenceController mController; @@ -78,39 +76,6 @@ public class CameraHalHdrplusPreferenceControllerTest { assertThat(mController.isAvailable()).isFalse(); } - @Test - public void isAvailable_withUserdebugBuild_shouldReturnTrue() { - when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus)) - .thenReturn(true); - - SettingsShadowSystemProperties.set( - CameraHalHdrplusPreferenceController.BUILD_TYPE, USERDEBUG_BUILD); - - assertThat(mController.isAvailable()).isTrue(); - } - - @Test - public void isAvailable_withEngBuild_shouldReturnTrue() { - when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus)) - .thenReturn(true); - - SettingsShadowSystemProperties.set( - CameraHalHdrplusPreferenceController.BUILD_TYPE, ENG_BUILD); - - assertThat(mController.isAvailable()).isTrue(); - } - - @Test - public void isAvailable_withUserBuild_shouldReturnFalse() { - when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus)) - .thenReturn(true); - - SettingsShadowSystemProperties.set( - CameraHalHdrplusPreferenceController.BUILD_TYPE, USER_BUILD); - - assertThat(mController.isAvailable()).isFalse(); - } - @Test public void displayPreference_cameraHalHdrplusEnabled_shouldCheckedPreference() { when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))