PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Developer option off must not affect laser sensor"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-23 15:07:13 +00:00
committed by Android (Google) Code Review
parent 93343d0ccd 78db757cad
commit 5ff9517f23
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/development/CameraLaserSensorPreferenceController.java
View File

@@ -75,12 +75,9 @@ public class CameraLaserSensorPreferenceController extends DeveloperOptionsPrefe
((SwitchPreference) mPreference).setChecked(enabled); ((SwitchPreference) mPreference).setChecked(enabled);
} }
@Override // There should be no impact on the current
protected void onDeveloperOptionsSwitchDisabled() { // laser sensor settings in case the developer
super.onDeveloperOptionsSwitchDisabled(); // settings switch is turned on or off!
SystemProperties.set(PROPERTY_CAMERA_LASER_SENSOR, Integer.toString(DISABLED));
((SwitchPreference) mPreference).setChecked(false);
}
private boolean isLaserSensorEnabled() { private boolean isLaserSensorEnabled() {
final String prop = SystemProperties.get(PROPERTY_CAMERA_LASER_SENSOR, final String prop = SystemProperties.get(PROPERTY_CAMERA_LASER_SENSOR,

12
tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
View File

@@ -128,16 +128,4 @@ public class CameraLaserSensorPreferenceControllerTest {
CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR, CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(CameraLaserSensorPreferenceController.ENABLED))); 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)));
}
} }