diff options
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 5c871ca..c075e0b 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -2023,6 +2023,7 @@ public class SettingsProvider extends ContentProvider { if ((oldVersion == newVersion || oldVersion == CM_SETTINGS_DB_VERSION)) { if (oldVersion == CM_SETTINGS_DB_VERSION && !hasReplayedDefaultsFromL()) { forceReplayAOSPDefaults(mUserId); + forceMigrateProfilesEnabled(mUserId); setDefaultsReplayedFromLFlag(); } return; @@ -2221,6 +2222,23 @@ public class SettingsProvider extends ContentProvider { } } + private void forceMigrateProfilesEnabled(int userId) { + final SettingsState systemSettings = getSystemSettingsLocked(userId); + final Setting settingLocked = systemSettings.getSettingLocked( + CMSettings.System.SYSTEM_PROFILES_ENABLED); + if (settingLocked != null) { + final String value = settingLocked.getValue(); + if (value != null) { + CMSettings.System.putStringForUser(getContext().getContentResolver(), + CMSettings.System.SYSTEM_PROFILES_ENABLED, + value, + userId); + systemSettings.deleteSettingLocked( + CMSettings.System.SYSTEM_PROFILES_ENABLED); + } + } + } + } } } |