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

* commit '4c9278950363fb14d848b7a67dc6dca13854dce8': Disable launching assist during setup
2015-07-29 19:00:23 +00:00
parent dbcb4e10ac 4c92789503
commit 34f8639292
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();