commit bd17928afcbead00b498a75a92a0a32a6cca7fee
author Bryce Lee <brycelee@google.com> Thu Dec 17 19:01:37 2015 -0800
committer Bryce Lee <brycelee@google.com> Fri Dec 18 03:05:20 2015 +0000
tree 8b38274ba3434c3fc8fdc84c014db18777b93266
parent be4904962eac3a2cd54c73629884c5892eb0379e
parent 6b9e5bf0c29d5a56cc2a4f6586c426a9111b2c93

resolve merge conflicts of 6b9e5bf0c2 to master.

Change-Id: Idada49313619533bfeb375ee232c942589457fa4

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 7365e66..bcb459a 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1890,7 +1890,7 @@
         }
 
         private final class UpgradeController {
-            private static final int SETTINGS_VERSION = 123;
+            private static final int SETTINGS_VERSION = 124;
 
             private final int mUserId;
 
@@ -2060,6 +2060,16 @@
                     }
                     currentVersion = 123;
                 }
+
+                if (currentVersion == 123) {
+                    final SettingsState globalSettings = getGlobalSettingsLocked();
+                    String defaultDisabledProfiles = (getContext().getResources().getString(
+                            R.string.def_bluetooth_disabled_profiles));
+                    globalSettings.insertSettingLocked(Settings.Global.BLUETOOTH_DISABLED_PROFILES,
+                            defaultDisabledProfiles, SettingsState.SYSTEM_PACKAGE_NAME);
+                    currentVersion = 124;
+                }
+
                 // vXXX: Add new settings above this point.
 
                 // Return the current version.