Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02bfd130 authored by Muyuan Li's avatar Muyuan Li Committed by android-build-merger
Browse files

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

am: f2d2aab3

* commit 'f2d2aab3':
  Fixes a bug in shortcut key.

Change-Id: Ic685e1b8a333c2c8d3db6d3037d7cd6fe5b266b5
parents 69d729b8 f2d2aab3

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

+3 −1
Original line number Diff line number Diff line
@@ -3396,7 +3396,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            IShortcutService shortcutService = mShortcutKeyServices.get(shortcutCode);

            if (shortcutService != null) {

                try {

                    if (isUserSetupComplete()) {

                        shortcutService.notifyShortcutKeyPressed(shortcutCode);

                    }

                } catch (RemoteException e) {

                    mShortcutKeyServices.delete(shortcutCode);

                }