commit 39d1381ed3c6abfa8600ab19b59c141456fb0f12
author Maurice Lam <yukl@google.com> Thu Jul 23 20:49:20 2015 -0700
committer Maurice Lam <yukl@google.com> Thu Jul 23 20:49:20 2015 -0700
tree ed8d85d6b50e18886fd8f0960928cfbea0493ce3
parent 7c482463cbea39cdbf2c3c8f481d82711cf0475b

Disable launching assist during setup

Check for user_setup_complete before launching the assist layer.

Bug: 22694702
Change-Id: I2509c2aa081002dced192a074716fb23f91dde86

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 dc3e2d6..b49441c 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 @@
 
     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();