am 75d958c4: Merge "Disable launching assist during setup" into mnc-dev

* commit '75d958c40e67c338d65df185ce1f09b164c58d49': Disable launching assist during setup
2015-07-29 18:43:02 +00:00
parent 7d1d4af341 75d958c40e
commit 4c92789503
1 changed files with 4 additions and 0 deletions
--- 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();