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

Commit de633573 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Settings: Enable laser sensor toggle for user builds"

parents 92aa8583 33b956d5

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

+1 −4
Original line number Diff line number Diff line
@@ -57,10 +57,7 @@ public class CameraLaserSensorPreferenceController extends 


    @Override

    public boolean isAvailable() {

        final String buildType = SystemProperties.get(BUILD_TYPE);

        return mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor) &&

                (TextUtils.equals(USERDEBUG_BUILD, buildType) || TextUtils.equals(ENG_BUILD,

                        buildType));

        return mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor);

    }



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -96,11 +96,11 @@ public class CameraLaserSensorPreferenceControllerTest { 
    }



    @Test

    public void isAvailable_withUserBuild_shouldReturnFalse() {

    public void isAvailable_withUserBuild_shouldReturnTrue() {

        SettingsShadowSystemProperties.set(

                CameraLaserSensorPreferenceController.BUILD_TYPE, USER_BUILD);



        assertThat(mController.isAvailable()).isFalse();

        assertThat(mController.isAvailable()).isTrue();

    }



    @Test