commit f2d2aab3f1a1e19e4ba52e274493a2ca4cd02f7b
author Muyuan Li <muyuanli@google.com> Thu Apr 14 20:50:38 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 14 20:50:39 2016 +0000
tree 05072525b8c42789df543f6183b99acf2ae3e026
parent 439525a99372edcd92e02ca2ec52a0f24b775348
parent b5dd049089a8c62efea445be9abd1f476fbf1ab9

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

services/core/java/com/android/server/policy/PhoneWindowManager.java

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index d8c0775..f6f401a 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 @@
             IShortcutService shortcutService = mShortcutKeyServices.get(shortcutCode);
             if (shortcutService != null) {
                 try {
-                    shortcutService.notifyShortcutKeyPressed(shortcutCode);
+                    if (isUserSetupComplete()) {
+                        shortcutService.notifyShortcutKeyPressed(shortcutCode);
+                    }
                 } catch (RemoteException e) {
                     mShortcutKeyServices.delete(shortcutCode);
                 }