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

Commit 6f9fd448 authored by Christophe Koessler's avatar Christophe Koessler
Browse files

DO NOT MERGE: Disable resume for guest session if user is ephemeral 

If the user is ephemeral, it shouldn't be possible to resume a previous
session. Only register the guestResumeSessionReceiver if the guest is
not ephemeral.

Bug: 122893274
Test: manual - local build
Change-Id: I16aa0e396ea8bd8d249ffcfb639438858bea4b35
(cherry picked from commit 32d5d50b)
parent f2079ee2

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

+3 −1
Original line number Diff line number Diff line
@@ -111,7 +111,9 @@ public class UserSwitcherController implements Dumpable { 
    public UserSwitcherController(Context context, KeyguardMonitor keyguardMonitor,

            @Named(MAIN_HANDLER_NAME) Handler handler, ActivityStarter activityStarter) {

        mContext = context;

        if (!UserManager.isGuestUserEphemeral()) {

            mGuestResumeSessionReceiver.register(context);

        }

        mKeyguardMonitor = keyguardMonitor;

        mHandler = handler;

        mActivityStarter = activityStarter;