diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index d8c0775d51013..f6f401af1b110 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3396,7 +3396,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { IShortcutService shortcutService = mShortcutKeyServices.get(shortcutCode); if (shortcutService != null) { try { - shortcutService.notifyShortcutKeyPressed(shortcutCode); + if (isUserSetupComplete()) { + shortcutService.notifyShortcutKeyPressed(shortcutCode); + } } catch (RemoteException e) { mShortcutKeyServices.delete(shortcutCode); }