From 39d1381ed3c6abfa8600ab19b59c141456fb0f12 Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Thu, 23 Jul 2015 20:49:20 -0700 Subject: [PATCH] Disable launching assist during setup Check for user_setup_complete before launching the assist layer. Bug: 22694702 Change-Id: I2509c2aa081002dced192a074716fb23f91dde86 --- .../java/com/android/server/policy/PhoneWindowManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index dc3e2d612e00e..b49441c1181e1 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3111,6 +3111,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { private void launchAssistAction(String hint, int deviceId) { sendCloseSystemWindows(SYSTEM_DIALOG_REASON_ASSIST); + if (!isUserSetupComplete()) { + // Disable opening assist window during setup + return; + } Bundle args = null; if (deviceId > Integer.MIN_VALUE) { args = new Bundle();