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

Settings: Enable laser sensor toggle for user builds

Browse Source 
User builds should also have the camera lensor enable/disable
developer option.

Bug: 71702869
Test: Manual,
make ROBOTEST_FILTER=CameraLaserSensorPreferenceControllerTest
RunSettingsRoboTests -j40
Change-Id: Iaa1aadfee0351b9e5fcaa8282e4dcd7b16e9ebf4
This commit is contained in:
Emilian Peev
2018-01-08 18:21:53 +00:00
parent 7937798b9d
commit 33b956d574
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,10 +57,7 @@ public class CameraLaserSensorPreferenceController extends
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
final String buildType = SystemProperties.get(BUILD_TYPE); return mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor);
return mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor) &&
(TextUtils.equals(USERDEBUG_BUILD, buildType) || TextUtils.equals(ENG_BUILD,
buildType));
} }
@Override @Override

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

@@ -96,11 +96,11 @@ public class CameraLaserSensorPreferenceControllerTest {
} }
@Test @Test
public void isAvailable_withUserBuild_shouldReturnFalse() { public void isAvailable_withUserBuild_shouldReturnTrue() {
SettingsShadowSystemProperties.set( SettingsShadowSystemProperties.set(
CameraLaserSensorPreferenceController.BUILD_TYPE, USER_BUILD); CameraLaserSensorPreferenceController.BUILD_TYPE, USER_BUILD);
assertThat(mController.isAvailable()).isFalse(); assertThat(mController.isAvailable()).isTrue();
} }
@Test @Test