diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java index f726321db9636..395add76dda49 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -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;