Settings: Show HAL HDR+ option in user build

Test: CameraHalHdrPlusPreferenceControllerV2Test
Bug: 66919557
Change-Id: Ibaadf1b24ba82a8440aae9058397c96db6f24188
This commit is contained in:
Chien-Yu Chen
2017-09-27 13:31:49 -07:00
parent 2d479598f0
commit bb41a76256
2 changed files with 3 additions and 38 deletions

View File

@@ -40,12 +40,6 @@ public class CameraHalHdrPlusPreferenceControllerV2 extends
static final String ENABLED = "1";
@VisibleForTesting
static final String DISABLED = "0";
@VisibleForTesting
static final String USERDEBUG_BUILD = "userdebug";
@VisibleForTesting
static final String ENG_BUILD = "eng";
@VisibleForTesting
static final String USER_BUILD = "user";
private SwitchPreference mPreference;
@@ -57,9 +51,7 @@ public class CameraHalHdrPlusPreferenceControllerV2 extends
public boolean isAvailable() {
final String buildType = SystemProperties.get(BUILD_TYPE);
return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus) &&
(TextUtils.equals(USERDEBUG_BUILD, buildType) ||
TextUtils.equals(ENG_BUILD, buildType));
return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus);
}
@Override