Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29bc6782 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[SettingsProvider] fix notify profile cache for clone-from-parent... 

Merge "[SettingsProvider] fix notify profile cache for clone-from-parent settings" into udc-dev am: 5cc3d8ca

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23768596



Change-Id: Id17ec1b967d684918f1ecabbbbfe291d5dd6b623
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 896590b7 5cc3d8ca

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -3558,11 +3558,11 @@ public class SettingsProvider extends ContentProvider { 
                if (isSecureSettingsKey(key)) {

                    maybeNotifyProfiles(getTypeFromKey(key), userId, uri, name,

                            sSecureCloneToManagedSettings);

                    maybeNotifyProfiles(SETTINGS_TYPE_SYSTEM, userId, uri, name,

                            sSystemCloneFromParentOnDependency.values());

                } else if (isSystemSettingsKey(key)) {

                    maybeNotifyProfiles(getTypeFromKey(key), userId, uri, name,

                            sSystemCloneToManagedSettings);

                    maybeNotifyProfiles(SETTINGS_TYPE_SYSTEM, userId, uri, name,

                            sSystemCloneFromParentOnDependency.keySet());

                }

            }