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

Commit 89863ea4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Suppress a11y shortcut on emergency dialer"

parents e4b106b1 7eec3798

core/java/android/view/WindowManagerGlobal.java

+4 −2
Original line number Diff line number Diff line
@@ -167,8 +167,10 @@ public final class WindowManagerGlobal { 
                sWindowManagerService = IWindowManager.Stub.asInterface(

                        ServiceManager.getService("window"));

                try {

                    sWindowManagerService = getWindowManagerService();

                    ValueAnimator.setDurationScale(sWindowManagerService.getCurrentAnimatorScale());

                    if (sWindowManagerService != null) {

                        ValueAnimator.setDurationScale(

                                sWindowManagerService.getCurrentAnimatorScale());

                    }

                } catch (RemoteException e) {

                    throw e.rethrowFromSystemServer();

                }

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

+2 −2
Original line number Diff line number Diff line
@@ -5736,7 +5736,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                            mScreenshotChordVolumeDownKeyConsumed = false;

                            cancelPendingPowerKeyAction();

                            interceptScreenshotChord();

                            if (!keyguardActive) {

                            if (!isKeyguardLocked()) {

                                interceptAccessibilityShortcutChord();

                            }

                        }
@@ -5754,7 +5754,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                            mA11yShortcutChordVolumeUpKeyConsumed = false;

                            cancelPendingPowerKeyAction();

                            cancelPendingScreenshotChordAction();

                            if (!keyguardActive) {

                            if (!isKeyguardLocked()) {

                                interceptAccessibilityShortcutChord();

                            }

                        }