Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d26fa03 authored by Chien-Yu Chen's avatar Chien-Yu Chen
Browse files

Settings: Show HAL HDR+ option in user build 

Test: CameraHalHdrplusPreferenceControllerTest
Bug: 66919557
Change-Id: I02e89d34db56398e64e12616f34b8584df25c48b
parent 56555e04

src/com/android/settings/development/CameraHalHdrplusPreferenceController.java

+1 −3
Original line number Diff line number Diff line
@@ -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

tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java

+0 −35
Original line number Diff line number Diff line
@@ -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))