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

Merge "Suppress a11y shortcut on emergency dialer"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-16 18:36:36 +00:00
committed by Android (Google) Code Review
parent e4b106b1aa 7eec37989f
commit 89863ea4f6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/WindowManagerGlobal.java
View File

@@ -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();
}

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

@@ -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();
}
}