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

Commit 03460e47 authored by Muyuan Li's avatar Muyuan Li Committed by android-build-merger
Browse files

Merge "Fixing shortcut key duplicate registration bug" into nyc-dev am: 605ec5cd 

am: 0c11bd10

* commit '0c11bd10':
  Fixing shortcut key duplicate registration bug
parents af00108c 0c11bd10

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

+2 −2
Original line number Diff line number Diff line
@@ -3360,7 +3360,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            throws RemoteException {

        synchronized (mLock) {

            IShortcutService service = mShortcutKeyServices.get(shortcutCode);

            if (service != null && service.asBinder().isBinderAlive()) {

            if (service != null && service.asBinder().pingBinder()) {

                throw new RemoteException("Key already exists.");

            }