commit 89863ea4f6e973a9405ee3c9fac79dd18b535c7e
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 16 18:36:36 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 16 18:36:39 2017 +0000
tree 66178d29d8fe45e6e8fb38dec1c93314ba7b5abf
parent e4b106b1aaf0f96a5006086d2a67e2c86e41c6a1
parent 7eec37989f1d030d8f933712e6cb2bff8d9e4104

Merge "Suppress a11y shortcut on emergency dialer"

core/java/android/view/WindowManagerGlobal.java

diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java
index fc6448a..c7e8dee 100644
--- a/core/java/android/view/WindowManagerGlobal.java
+++ b/core/java/android/view/WindowManagerGlobal.java
@@ -167,8 +167,10 @@
                 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

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 3e05157..477bb7f 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -5736,7 +5736,7 @@
                             mScreenshotChordVolumeDownKeyConsumed = false;
                             cancelPendingPowerKeyAction();
                             interceptScreenshotChord();
-                            if (!keyguardActive) {
+                            if (!isKeyguardLocked()) {
                                 interceptAccessibilityShortcutChord();
                             }
                         }
@@ -5754,7 +5754,7 @@
                             mA11yShortcutChordVolumeUpKeyConsumed = false;
                             cancelPendingPowerKeyAction();
                             cancelPendingScreenshotChordAction();
-                            if (!keyguardActive) {
+                            if (!isKeyguardLocked()) {
                                 interceptAccessibilityShortcutChord();
                             }
                         }