diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index c68fe81d0565b..56fb5e8fd449c 100644 --- 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); + } } }