Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev am: ffea17b57f

am: c97bf8daef

Change-Id: Id631d10c6eda378bb9fa99025ee5ac68c82cb10f

src/com/android/settings/development/DevelopmentSettings.java

@@ -835,6 +835,10 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
                 onPreferenceTreeClick(cb);
             }
         }
+        if (mBluetoothEnableInbandRinging != null) {
+            mBluetoothEnableInbandRinging.setChecked(true);
+            onPreferenceTreeClick(mBluetoothEnableInbandRinging);
+        }
         mBugReportInPowerController.resetPreference();
         mEnableAdbController.resetPreference();
         resetDebuggerOptions();