summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 9ea486bcb496..a800e18d5a4f 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -3114,6 +3114,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();