From 78db757cad6ca72d10ad865603b1e960d90c3cd2 Mon Sep 17 00:00:00 2001 From: Emilian Peev Date: Thu, 19 Sep 2019 10:47:32 -0700 Subject: [PATCH] Developer option off must not affect laser sensor Turning developer settings to on or off must not change the current laser sensor preference. Bug: 140016130 Test: mma ROBOTEST_FILTER=CameraLaserSensorPreferenceControllerTest, manual using Settings application Change-Id: Ieb30527e5df97abcb00a6624e1ced93f9198c713 --- .../CameraLaserSensorPreferenceController.java | 9 +++------ .../CameraLaserSensorPreferenceControllerTest.java | 12 ------------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java index ec0ca24b6e6..67172809535 100644 --- a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java +++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java @@ -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, diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java index aa9cb46db15..d469c7193b3 100644 --- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java @@ -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))); - } }