Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-19 18:21:43 +00:00
committed by Android (Google) Code Review
parent cb8a640cef d5f1a555f2
commit 5b84ba3b15
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -2276,15 +2276,21 @@ public class SettingsProvider extends ContentProvider {
SettingsState.SYSTEM_PACKAGE_NAME);
}
}
currentVersion = 123;
}
if (currentVersion == 123) {
// Those content is moved from version 123, only for F, ref: b/37338202.
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;
}
if (currentVersion == 123) {
// Due to merge resolution, the version 123's content on Emerald is in version
// 122. If keep the content in version 123, OTA from E to F would reset the HFP
// config, ref: b/37338202. So we need skip version 123 on F, and only on F.
currentVersion = 124;
}