Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Disable resume for guest session if user is ephemeral" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-31 19:45:25 +00:00
committed by Android (Google) Code Review
parent e50aa221bc 6f9fd4487a
commit 40cff7025a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;