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

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

Merge "Developer option off must not affect laser sensor"

parents 93343d0c 78db757c

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

+3 −6
Original line number Diff line number Diff line
@@ -75,12 +75,9 @@ public class CameraLaserSensorPreferenceController extends DeveloperOptionsPrefe 
        ((SwitchPreference) mPreference).setChecked(enabled);

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        super.onDeveloperOptionsSwitchDisabled();

        SystemProperties.set(PROPERTY_CAMERA_LASER_SENSOR, Integer.toString(DISABLED));

        ((SwitchPreference) mPreference).setChecked(false);

    }

    // There should be no impact on the current

    // laser sensor settings in case the developer

    // settings switch is turned on or off!



    private boolean isLaserSensorEnabled() {

        final String prop = SystemProperties.get(PROPERTY_CAMERA_LASER_SENSOR,

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

+0 −12
Original line number Diff line number Diff line
@@ -128,16 +128,4 @@ public class CameraLaserSensorPreferenceControllerTest { 
                        CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,

                        Integer.toString(CameraLaserSensorPreferenceController.ENABLED)));

    }



    @Test

    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {

        mController.onDeveloperOptionsSwitchDisabled();



        verify(mPreference).setEnabled(false);

        verify(mPreference).setChecked(false);

        assertThat(Integer.toString(CameraLaserSensorPreferenceController.DISABLED)).isEqualTo(

                SystemProperties.get(

                        CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,

                        Integer.toString(CameraLaserSensorPreferenceController.ENABLED)));

    }

}