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 32d5d50bfd)
This commit is contained in:
@@ -111,7 +111,9 @@ public class UserSwitcherController implements Dumpable {
|
|||||||
public UserSwitcherController(Context context, KeyguardMonitor keyguardMonitor,
|
public UserSwitcherController(Context context, KeyguardMonitor keyguardMonitor,
|
||||||
@Named(MAIN_HANDLER_NAME) Handler handler, ActivityStarter activityStarter) {
|
@Named(MAIN_HANDLER_NAME) Handler handler, ActivityStarter activityStarter) {
|
||||||
mContext = context;
|
mContext = context;
|
||||||
mGuestResumeSessionReceiver.register(context);
|
if (!UserManager.isGuestUserEphemeral()) {
|
||||||
|
mGuestResumeSessionReceiver.register(context);
|
||||||
|
}
|
||||||
mKeyguardMonitor = keyguardMonitor;
|
mKeyguardMonitor = keyguardMonitor;
|
||||||
mHandler = handler;
|
mHandler = handler;
|
||||||
mActivityStarter = activityStarter;
|
mActivityStarter = activityStarter;
|
||||||
|
|||||||
Reference in New Issue
Block a user