Merge "Don't reset default launcher if the user is not loaded"

2020-12-14 18:34:52 +00:00
parent 155e594fee 9d36cc2280
commit 849332255e
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -537,7 +537,9 @@ public class ShortcutService extends IShortcutService.Stub {
        synchronized (mLock) {
            // Clear the launcher cache for this user. It will be set again next time the default
            // launcher is read from RoleManager.
-            getUserShortcutsLocked(userId).setCachedLauncher(null);
+            if (isUserLoadedLocked(userId)) {
+                getUserShortcutsLocked(userId).setCachedLauncher(null);
+            }
        }
    }