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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-10 10:26:42 +00:00
committed by Android (Google) Code Review
parent 92aa8583c6 33b956d574
commit de63357366
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
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

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

@@ -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