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:
Christophe Koessler
2019-05-23 11:18:30 -07:00
parent f2079ee257
commit 6f9fd4487a

View File

@@ -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;
mGuestResumeSessionReceiver.register(context);
if (!UserManager.isGuestUserEphemeral()) {
mGuestResumeSessionReceiver.register(context);
}
mKeyguardMonitor = keyguardMonitor;
mHandler = handler;
mActivityStarter = activityStarter;