diff --git a/res/values/config.xml b/res/values/config.xml
index f964d5ee241..18a8264eb61 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -41,9 +41,6 @@
     <!-- Whether to show TelphonyMonitor switch in Developer Options -->
     <bool name="config_show_telephony_monitor">false</bool>
 
-    <!-- Whether to show Camera HAL HDR+ switch in Developer Options -->
-    <bool name="config_show_camera_hal_hdrplus">false</bool>
-
     <!-- Whether to show Camera laser sensor switch in Developer Options -->
     <bool name="config_show_camera_laser_sensor">false</bool>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1deb39e1333..c4f71b09e75 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8241,12 +8241,6 @@
     <!-- Toast message letting the user know the how to trigger telephony monitor -->
     <string name="telephony_monitor_toast">To apply telephony monitor change, reboot device</string>
 
-    <!-- Title for Camera HAL HDR+ switch [CHAR LIMIT=50] -->
-    <string name="camera_hal_hdrplus_switch">Camera HAL HDR+</string>
-
-    <!-- Toast message letting the user know how to enable Camera HAL HDR+ -->
-    <string name="camera_hal_hdrplus_toast">To apply Camera HAL HDR+ change, reboot device</string>
-
     <!-- Title for Camera laser sensor switch [CHAR LIMIT=NONE] -->
     <string name="camera_laser_sensor_switch">Camera Laser Sensor</string>
 
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index ecfa5a8f2c0..aec72bc08b9 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -167,10 +167,6 @@
             android:key="camera_laser_sensor_switch"
             android:title="@string/camera_laser_sensor_switch" />
 
-        <SwitchPreference
-            android:key="camera_hal_hdrplus_switch"
-            android:title="@string/camera_hal_hdrplus_switch" />
-
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_networking_category"
diff --git a/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java b/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java
deleted file mode 100644
index 73b883d9fde..00000000000
--- a/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import android.content.Context;
-import android.os.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.widget.Toast;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-public class CameraHalHdrplusPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin {
-
-    private static final String KEY_CAMERA_HAL_HDRPLUS_SWITCH = "camera_hal_hdrplus_switch";
-    @VisibleForTesting
-    static final String BUILD_TYPE = "ro.build.type";
-    @VisibleForTesting
-    static final String PROPERTY_CAMERA_HAL_HDRPLUS = "persist.camera.hdrplus.enable";
-    @VisibleForTesting
-    static final String ENABLED = "1";
-    @VisibleForTesting
-    static final String DISABLED = "0";
-
-    private SwitchPreference mPreference;
-
-    public CameraHalHdrplusPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        if (isAvailable()) {
-            mPreference = (SwitchPreference) screen.findPreference(KEY_CAMERA_HAL_HDRPLUS_SWITCH);
-            mPreference.setChecked(isHalHdrplusEnabled());
-        }
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_CAMERA_HAL_HDRPLUS_SWITCH;
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus);
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        updatePreference();
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (KEY_CAMERA_HAL_HDRPLUS_SWITCH.equals(preference.getKey())) {
-            final SwitchPreference switchPreference = (SwitchPreference)preference;
-            SystemProperties.set(PROPERTY_CAMERA_HAL_HDRPLUS,
-                    switchPreference.isChecked() ? ENABLED : DISABLED);
-            Toast.makeText(mContext, R.string.camera_hal_hdrplus_toast,
-                    Toast.LENGTH_LONG).show();
-            return true;
-        }
-        return false;
-    }
-
-    public void enablePreference(boolean enabled) {
-        if (isAvailable()) {
-            mPreference.setEnabled(enabled);
-        }
-    }
-
-    public boolean updatePreference() {
-        if (!isAvailable()) {
-            return false;
-        }
-        final boolean enabled = isHalHdrplusEnabled();
-        mPreference.setChecked(enabled);
-        return enabled;
-    }
-
-    private boolean isHalHdrplusEnabled() {
-        return SystemProperties.getBoolean(PROPERTY_CAMERA_HAL_HDRPLUS, true);
-    }
-}
diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index 6b01831290a..cbc3959143a 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -366,7 +366,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
     private BugReportPreferenceController mBugReportController;
     private BugReportInPowerPreferenceController mBugReportInPowerController;
     private TelephonyMonitorPreferenceController mTelephonyMonitorController;
-    private CameraHalHdrplusPreferenceController mCameraHalHdrplusController;
     private CameraLaserSensorPreferenceController mCameraLaserSensorController;
 
     private BroadcastReceiver mEnableAdbReceiver;
@@ -408,7 +407,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         mTelephonyMonitorController = new TelephonyMonitorPreferenceController(getActivity());
         mWebViewAppPrefController = new WebViewAppPreferenceController(getActivity());
         mVerifyAppsOverUsbController = new VerifyAppsOverUsbPreferenceController(getActivity());
-        mCameraHalHdrplusController = new CameraHalHdrplusPreferenceController(getActivity());
         mCameraLaserSensorController = new CameraLaserSensorPreferenceController(getActivity());
 
         setIfOnlyAvailableForAdmins(true);
@@ -442,7 +440,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         mBugReportInPowerController.displayPreference(getPreferenceScreen());
         mTelephonyMonitorController.displayPreference(getPreferenceScreen());
         mWebViewAppPrefController.displayPreference(getPreferenceScreen());
-        mCameraHalHdrplusController.displayPreference(getPreferenceScreen());
         mEnableAdbController.displayPreference(getPreferenceScreen());
 
         mCameraLaserSensorController.displayPreference(getPreferenceScreen());
@@ -667,7 +664,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         mBugReportInPowerController.enablePreference(enabled);
         mTelephonyMonitorController.enablePreference(enabled);
         mWebViewAppPrefController.enablePreference(enabled);
-        mCameraHalHdrplusController.enablePreference(enabled);
         mCameraLaserSensorController.enablePreference(enabled);
         updateAllOptions();
     }
@@ -802,7 +798,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         }
         mHaveDebugSettings |= mBugReportInPowerController.updatePreference();
         mHaveDebugSettings |= mTelephonyMonitorController.updatePreference();
-        mHaveDebugSettings |= mCameraHalHdrplusController.updatePreference();
         mHaveDebugSettings |= mCameraLaserSensorController.updatePreference();
         updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr,
                 Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
@@ -2481,10 +2476,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
             return true;
         }
 
-        if (mCameraHalHdrplusController.handlePreferenceTreeClick(preference)) {
-            return true;
-        }
-
         if (mEnableAdbController.handlePreferenceTreeClick(preference)) {
             return true;
         }
diff --git a/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java
deleted file mode 100644
index f5ef38fef60..00000000000
--- a/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import android.content.Context;
-import android.os.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.RuntimeEnvironment;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {SettingsShadowSystemProperties.class})
-public class CameraHalHdrplusPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private SwitchPreference mPreference;
-
-    static final String USERDEBUG_BUILD = "userdebug";
-
-    private CameraHalHdrplusPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new CameraHalHdrplusPreferenceController(mContext);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowSystemProperties.clear();
-    }
-
-    @Test
-    public void isAvailable_withConfigNoShow_shouldReturnFalse() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
-                .thenReturn(false);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void displayPreference_cameraHalHdrplusEnabled_shouldCheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
-                .thenReturn(true);
-
-        SettingsShadowSystemProperties.set(
-                CameraHalHdrplusPreferenceController.PROPERTY_CAMERA_HAL_HDRPLUS,
-                CameraHalHdrplusPreferenceController.ENABLED);
-        SettingsShadowSystemProperties.set(
-                CameraHalHdrplusPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Test
-    public void displayPreference_cameraHalHdrplusEnabled_shouldUncheckedPreference() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
-                .thenReturn(true);
-
-        SettingsShadowSystemProperties.set(
-                CameraHalHdrplusPreferenceController.PROPERTY_CAMERA_HAL_HDRPLUS,
-                CameraHalHdrplusPreferenceController.DISABLED);
-        SettingsShadowSystemProperties.set(
-                CameraHalHdrplusPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_preferenceChecked_shouldEnableCameraHalHdrplus() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
-                .thenReturn(true);
-
-        when(mPreference.isChecked()).thenReturn(true);
-
-        when(mContext.getResources().getString(R.string.camera_hal_hdrplus_toast)).thenReturn(
-            RuntimeEnvironment.application.getString(R.string.camera_hal_hdrplus_toast));
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(CameraHalHdrplusPreferenceController.ENABLED.equals(
-            SystemProperties.get(
-                        CameraHalHdrplusPreferenceController.PROPERTY_CAMERA_HAL_HDRPLUS,
-                        CameraHalHdrplusPreferenceController.DISABLED))).isTrue();
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableCameraHalHdrplus() {
-        when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
-                .thenReturn(true);
-
-        when(mPreference.isChecked()).thenReturn(false);
-
-        when(mContext.getResources().getString(R.string.camera_hal_hdrplus_toast)).thenReturn(
-                RuntimeEnvironment.application.getString(R.string.camera_hal_hdrplus_toast));
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(CameraHalHdrplusPreferenceController.DISABLED.equals(
-                SystemProperties.get(
-                        CameraHalHdrplusPreferenceController.PROPERTY_CAMERA_HAL_HDRPLUS,
-                        CameraHalHdrplusPreferenceController.DISABLED))).isTrue();
-    }
-}