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

Merge "Notify the profile when cloned settings are changed." into mnc-dev

Browse Source
This commit is contained in:
Esteban Talavera
2015-07-07 09:27:22 +00:00
committed by Android (Google) Code Review
parent bc687f96c7 310e1eeb35
commit 5a81b61e87
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1774,6 +1774,26 @@ public class SettingsProvider extends ContentProvider {
Uri uri = getNotificationUriFor(key, name); Uri uri = getNotificationUriFor(key, name);
sendNotify(uri, userId); sendNotify(uri, userId);
if (isSecureSettingsKey(key)) {
maybeNotifyProfiles(userId, uri, name, sSecureCloneToManagedSettings);
} else if (isSystemSettingsKey(key)) {
maybeNotifyProfiles(userId, uri, name, sSystemCloneToManagedSettings);
}
}
private void maybeNotifyProfiles(int userId, Uri uri, String name,
Set<String> keysCloned) {
if (keysCloned.contains(name)) {
List<UserInfo> profiles = mUserManager.getProfiles(userId);
int size = profiles.size();
for (int i = 0; i < size; i++) {
UserInfo profile = profiles.get(i);
// the notification for userId has already been sent.
if (profile.id != userId) {
sendNotify(uri, profile.id);
}
}
}
} }
private int makeKey(int type, int userId) { private int makeKey(int type, int userId) {