Merge "Fixes a bug in shortcut key." into nyc-dev

2016-04-14 20:50:38 +00:00
parent 439525a993 b5dd049089
commit f2d2aab3f1
1 changed files with 3 additions and 1 deletions
--- 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);
                }