Merge "[SettingsProvider] fix notify profile cache for clone-from-parent settings" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
5cc3d8cab2
@@ -3558,11 +3558,11 @@ public class SettingsProvider extends ContentProvider {
|
|||||||
if (isSecureSettingsKey(key)) {
|
if (isSecureSettingsKey(key)) {
|
||||||
maybeNotifyProfiles(getTypeFromKey(key), userId, uri, name,
|
maybeNotifyProfiles(getTypeFromKey(key), userId, uri, name,
|
||||||
sSecureCloneToManagedSettings);
|
sSecureCloneToManagedSettings);
|
||||||
maybeNotifyProfiles(SETTINGS_TYPE_SYSTEM, userId, uri, name,
|
|
||||||
sSystemCloneFromParentOnDependency.values());
|
|
||||||
} else if (isSystemSettingsKey(key)) {
|
} else if (isSystemSettingsKey(key)) {
|
||||||
maybeNotifyProfiles(getTypeFromKey(key), userId, uri, name,
|
maybeNotifyProfiles(getTypeFromKey(key), userId, uri, name,
|
||||||
sSystemCloneToManagedSettings);
|
sSystemCloneToManagedSettings);
|
||||||
|
maybeNotifyProfiles(SETTINGS_TYPE_SYSTEM, userId, uri, name,
|
||||||
|
sSystemCloneFromParentOnDependency.keySet());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user