drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Copy lockscreen notification settings upon upgrade" into nyc-dev

Browse Source 
am: 534537d

* commit '534537d313fdf456979aaf7cdbabc63c718e1d44':
  Copy lockscreen notification settings upon upgrade

Change-Id: I920dd5b11c52de96ebac3cd42109ef1ed9cbf9f8
This commit is contained in:
Daniel U
2016-04-08 15:56:09 +00:00
committed by android-build-merger
parent bd61907ba8 534537d313
commit ee6b95a226
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1942,7 +1942,7 @@ public class SettingsProvider extends ContentProvider {
}
private final class UpgradeController {
private static final int SETTINGS_VERSION = 126;
private static final int SETTINGS_VERSION = 127;
private final int mUserId;
@ -2167,6 +2167,36 @@ public class SettingsProvider extends ContentProvider {
currentVersion = 126;
}
if (currentVersion == 126) {
// Version 126: copy the primary values of LOCK_SCREEN_SHOW_NOTIFICATIONS and
// LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS into managed profile.
if (mUserManager.isManagedProfile(userId)) {
final SettingsState systemSecureSettings =
getSecureSettingsLocked(UserHandle.USER_SYSTEM);
final Setting showNotifications = systemSecureSettings.getSettingLocked(
Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS);
if (showNotifications != null) {
final SettingsState secureSettings = getSecureSettingsLocked(userId);
secureSettings.insertSettingLocked(
Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS,
showNotifications.getValue(),
SettingsState.SYSTEM_PACKAGE_NAME);
}
final Setting allowPrivate = systemSecureSettings.getSettingLocked(
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS);
if (allowPrivate != null) {
final SettingsState secureSettings = getSecureSettingsLocked(userId);
secureSettings.insertSettingLocked(
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
allowPrivate.getValue(),
SettingsState.SYSTEM_PACKAGE_NAME);
}
}
currentVersion = 127;
}
// vXXX: Add new settings above this point.
// Return the current version.