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

Commit efa5b5a4 authored by Matt Pietal's avatar Matt Pietal
Browse files

User switcher - Create user dialog fixes 

Make sure the activity is started with the correct user in order to
display properly. Also, the ShadeController is not properly bound in
dagger for non-system users, which was throwing a
NullPointerException. Avoid this and instead use a broadcast to close
the shade.

Fixes: 219638055
Test: atest UserSwitcherControllerTest
Change-Id: I8af80aa10b1bcac92eecdbc65b750a734b2f86ac
parent 54dbcaeb

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java

+6 −8
Original line number Diff line number Diff line
@@ -76,14 +76,11 @@ import com.android.systemui.plugins.FalsingManager; 
import com.android.systemui.qs.QSUserSwitcherEvent;

import com.android.systemui.qs.user.UserSwitchDialogController.DialogShower;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.statusbar.phone.ShadeController;

import com.android.systemui.statusbar.phone.SystemUIDialog;

import com.android.systemui.telephony.TelephonyListenerManager;

import com.android.systemui.user.CreateUserActivity;

import com.android.systemui.util.settings.SecureSettings;



import dagger.Lazy;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.lang.ref.WeakReference;
@@ -129,7 +126,6 @@ public class UserSwitcherController implements Dumpable { 
    private final InteractionJankMonitor mInteractionJankMonitor;

    private final LatencyTracker mLatencyTracker;

    private final DialogLaunchAnimator mDialogLaunchAnimator;

    private final Lazy<ShadeController> mShadeController;



    private ArrayList<UserRecord> mUsers = new ArrayList<>();

    @VisibleForTesting
@@ -178,7 +174,6 @@ public class UserSwitcherController implements Dumpable { 
            InteractionJankMonitor interactionJankMonitor,

            LatencyTracker latencyTracker,

            DumpManager dumpManager,

            Lazy<ShadeController> shadeController,

            DialogLaunchAnimator dialogLaunchAnimator) {

        mContext = context;

        mActivityManager = activityManager;
@@ -207,7 +202,6 @@ public class UserSwitcherController implements Dumpable { 
        mActivityStarter = activityStarter;

        mUserManager = userManager;

        mDialogLaunchAnimator = dialogLaunchAnimator;

        mShadeController = shadeController;



        IntentFilter filter = new IntentFilter();

        filter.addAction(Intent.ACTION_USER_ADDED);
@@ -1206,8 +1200,12 @@ public class UserSwitcherController implements Dumpable { 
                if (ActivityManager.isUserAMonkey()) {

                    return;

                }

                mShadeController.get().collapsePanel();

                getContext().startActivity(CreateUserActivity.createIntentForStart(getContext()));

                // Use broadcast instead of ShadeController, as this dialog may have started in

                // another process and normal dagger bindings are not available

                getContext().sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));

                getContext().startActivityAsUser(

                        CreateUserActivity.createIntentForStart(getContext()),

                        mUserTracker.getUserHandle());

            }

        }

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt

+0 −3
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ import com.android.systemui.qs.QSUserSwitcherEvent 
import com.android.systemui.qs.user.UserSwitchDialogController

import com.android.systemui.settings.UserTracker

import com.android.systemui.statusbar.phone.NotificationShadeWindowView

import com.android.systemui.statusbar.phone.ShadeController

import com.android.systemui.telephony.TelephonyListenerManager

import com.android.systemui.util.concurrency.FakeExecutor

import com.android.systemui.util.settings.SecureSettings
@@ -95,7 +94,6 @@ class UserSwitcherControllerTest : SysuiTestCase() { 
    @Mock private lateinit var notificationShadeWindowView: NotificationShadeWindowView

    @Mock private lateinit var threadedRenderer: ThreadedRenderer

    @Mock private lateinit var dialogLaunchAnimator: DialogLaunchAnimator

    @Mock private lateinit var shadeController: ShadeController

    private lateinit var testableLooper: TestableLooper

    private lateinit var bgExecutor: FakeExecutor

    private lateinit var uiExecutor: FakeExecutor
@@ -171,7 +169,6 @@ class UserSwitcherControllerTest : SysuiTestCase() { 
                interactionJankMonitor,

                latencyTracker,

                dumpManager,

                { shadeController },

                dialogLaunchAnimator)

        userSwitcherController.init(notificationShadeWindowView)

    }