From 32d5d50bfdaad20ae1a6cbb629402106fcc89b78 Mon Sep 17 00:00:00 2001
From: Christophe Koessler <ckoessler@google.com>
Date: Thu, 23 May 2019 11:18:30 -0700
Subject: [PATCH] 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
---
 .../systemui/statusbar/policy/UserSwitcherController.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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;