From 33b956d5741dd08a69b74f18bbd58afcc062792f Mon Sep 17 00:00:00 2001
From: Emilian Peev <epeev@google.com>
Date: Mon, 8 Jan 2018 18:21:53 +0000
Subject: [PATCH] Settings: Enable laser sensor toggle for user builds

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
---
 .../development/CameraLaserSensorPreferenceController.java   | 5 +----
 .../CameraLaserSensorPreferenceControllerTest.java           | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
index 41a79831bd1..3f0951335d1 100644
--- a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
+++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
@@ -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
diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
index 1443d16d0e0..7c8f3181a71 100644
--- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
@@ -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