From 0d85ee2e7851ca9ba4afc465844e43910e4c0ce7 Mon Sep 17 00:00:00 2001 From: Nancy Zheng Date: Thu, 29 Sep 2016 09:15:56 -0700 Subject: Do not launch assistant via long press when device is locked. Bug: 30194057 Change-Id: I6cd8046fd34308abbbbd1e3f3219d70af40b55c5 --- .../core/java/com/android/server/policy/PhoneWindowManager.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index b623dd5d6867..2026897dc43f 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -1373,8 +1373,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { case LONG_PRESS_BACK_NOTHING: break; case LONG_PRESS_BACK_GO_TO_VOICE_ASSIST: - Intent intent = new Intent(Intent.ACTION_VOICE_ASSIST); - startActivityAsUser(intent, UserHandle.CURRENT_OR_SELF); + final boolean keyguardActive = mKeyguardDelegate == null + ? false + : mKeyguardDelegate.isShowing(); + if (!keyguardActive) { + Intent intent = new Intent(Intent.ACTION_VOICE_ASSIST); + startActivityAsUser(intent, UserHandle.CURRENT_OR_SELF); + } break; } } -- cgit v1.2.3-59-g8ed1b