summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider/src
diff options
context:
space:
mode:
authorBryce Lee <brycelee@google.com>2015-12-16 13:32:28 -0800
committerBryce Lee <brycelee@google.com>2015-12-16 13:32:28 -0800
commitec85f34812b0f66715ad5ae4d1485f98a690746c (patch)
tree35b3a9db3776d558995c30432c8ded75947c7a80 /packages/SettingsProvider/src
parent487f0d3d1556296ef53c449d7ec5de5a0dac1f83 (diff)
downloadframeworks_base-ec85f34812b0f66715ad5ae4d1485f98a690746c.zip
frameworks_base-ec85f34812b0f66715ad5ae4d1485f98a690746c.tar.gz
frameworks_base-ec85f34812b0f66715ad5ae4d1485f98a690746c.tar.bz2
Add setting for declaring disabled bluetooth profiles.
Bug: 25900899 Change-Id: I420a7c590d72ba10f3e466d15dccfdbb520e810a
Diffstat (limited to 'packages/SettingsProvider/src')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 73971ad..aa00f7d 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1855,7 +1855,7 @@ public class SettingsProvider extends ContentProvider {
}
private final class UpgradeController {
- private static final int SETTINGS_VERSION = 122;
+ private static final int SETTINGS_VERSION = 123;
private final int mUserId;
@@ -2007,6 +2007,16 @@ public class SettingsProvider extends ContentProvider {
}
currentVersion = 122;
}
+
+ if (currentVersion == 122) {
+ 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 = 123;
+ }
+
// vXXX: Add new settings above this point.
// Return the current version.