summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Muyuan Li <muyuanli@google.com> 2016-04-14 13:22:20 -0700
committer Muyuan Li <muyuanli@google.com> 2016-04-14 20:48:13 +0000
commitb5dd049089a8c62efea445be9abd1f476fbf1ab9 (patch)
tree009ed2f105d532b08ae280a5e3e8388b0b3165e2
parent98e46791d5e636abc0346e8687e864a73eac9943 (diff)
Fixes a bug in shortcut key.
All shortcut keys that are dispatched to listeners will be checked against user provisioning status. Only if user setup is complete will the listeners receive shortcut keys. Bug: 28192375 Change-Id: Iecc5a21a40d07bdc4f71d1a36187cca4a5b30bde (cherry picked from commit f0667f077f66ba3e58387f7570dd82a26aaed7b8)
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index d8c0775d5101..f6f401af1b11 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);
}