Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 103e96c5 authored by Maurice Lam's avatar Maurice Lam Committed by Android Git Automerger
Browse files

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

* commit '34f86392':
  Disable launching assist during setup
parents f96965ae 34f86392

services/core/java/com/android/server/policy/PhoneWindowManager.java

+4 −0
Original line number Diff line number Diff line
@@ -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();