Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Muyuan Li
2016-04-14 20:50:38 +00:00
committed by Android (Google) Code Review
parent 439525a993 b5dd049089
commit f2d2aab3f1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -3396,7 +3396,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
IShortcutService shortcutService = mShortcutKeyServices.get(shortcutCode); IShortcutService shortcutService = mShortcutKeyServices.get(shortcutCode);
if (shortcutService != null) { if (shortcutService != null) {
try { try {
shortcutService.notifyShortcutKeyPressed(shortcutCode); if (isUserSetupComplete()) {
shortcutService.notifyShortcutKeyPressed(shortcutCode);
}
} catch (RemoteException e) { } catch (RemoteException e) {
mShortcutKeyServices.delete(shortcutCode); mShortcutKeyServices.delete(shortcutCode);
} }