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