From af79c1f5c681b05fa1c60d974cf4a5fcbb60febc Mon Sep 17 00:00:00 2001
From: Songchun Fan <schfan@google.com>
Date: Wed, 21 Jun 2023 11:31:09 -0700
Subject: [PATCH] [SettingsProvider] fix notify profile cache for
 clone-from-parent settings

This line was in the wrong place with the wrong params.. It was never an
issue until we refactored the caching mechanism. Fixing it to correctly
notify the profile user's settings caches.

BUG: 284081256
Test: manual with a test app running in the work profile
Change-Id: Ie7b6558e682b7c2d6f6e091e3acc4a63ebc7c5de
---
 .../src/com/android/providers/settings/SettingsProvider.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 6a9c4d80d332f..23b63089849f9 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -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());
                 }
             }