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

Commit 9a634991 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed a bug where the AssistComponent was outdated 

It also wasn’t updated when switching users.

Bug: 22005038
Change-Id: I45e58de5f48e3769f114ff830d62c287d2b04d4f
parent 9f49dcda

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+8 −0
Original line number Diff line number Diff line
@@ -311,4 +311,12 @@ public class AssistManager { 
    public void showDisclosure() {

        mAssistDisclosure.postShow();

    }



    public void onUserSwitched(int newUserId) {

        updateAssistInfo();

    }



    public void prepareBeforeInvocation() {

        updateAssistInfo();

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+2 −0
Original line number Diff line number Diff line
@@ -1028,6 +1028,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    private int mShowSearchHoldoff = 0;

    private Runnable mInvokeAssist = new Runnable() {

        public void run() {

            mAssistManager.prepareBeforeInvocation();

            invokeAssistGesture(true /* vibrate */);

            awakenDreams();

            if (mNavigationBarView != null) {
@@ -2917,6 +2918,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        updateNotifications();

        resetUserSetupObserver();

        setControllerUsers();

        mAssistManager.onUserSwitched(newUserId);

    }



    private void setControllerUsers() {