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

Commit 0c7592ff authored by Winson Chung's avatar Winson Chung
Browse files

Fixing crash when fetching SysUI components for secondary user. 

Bug: 35028456
Test: Manual, launch the secondary user and try to enter recents.
Change-Id: I16c21b0f8222f885070550c25615be6b5dfa5b4c
parent f9008716

packages/SystemUI/src/com/android/systemui/SystemUIApplication.java

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ public class SystemUIApplication extends Application implements SysUiServiceProv 
     * above.

     */

    private final Class<?>[] SERVICES_PER_USER = new Class[] {

            Dependency.class,

            Recents.class,

            PipUI.class

    };

packages/SystemUI/src/com/android/systemui/recents/Recents.java

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,6 @@ public class Recents extends SystemUI 
        sTaskLoader = new RecentsTaskLoader(mContext);

        sConfiguration = new RecentsConfiguration(mContext);

        mHandler = new Handler();

        getComponent(CommandQueue.class).addCallbacks(this);

        UiModeManager uiModeManager = (UiModeManager) mContext.

                getSystemService(Context.UI_MODE_SERVICE);

        if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) {
@@ -234,6 +233,7 @@ public class Recents extends SystemUI 
        if (sSystemServicesProxy.isSystemUser(processUser)) {

            // For the system user, initialize an instance of the interface that we can pass to the

            // secondary user

            getComponent(CommandQueue.class).addCallbacks(this);

            mSystemToUserCallbacks = new RecentsSystemUser(mContext, mImpl);

        } else {

            // For the secondary user, bind to the primary user's service to get a persistent