Merge "Show the bouncer at start up if the headless user flag is set" into pi-dev

am: 36fc3b1a53

Change-Id: I9d4fd38bdfa3c605583436cda9f331148113d551

1 files changed, 7 insertions, 0 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java
index ba265d877a8d..f78e3912ad91 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java
@@ -19,6 +19,8 @@ package com.android.systemui.statusbar.car;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
+import android.content.pm.UserInfo;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewStub;
 
@@ -60,6 +62,11 @@ public class FullscreenUserSwitcher {
     }
 
     public void show() {
+        // On a switch from the system user, don't show the user switcher
+        if (mUserManagerHelper.isHeadlessSystemUser() && mUserManagerHelper
+            .userIsSystemUser(mUserManagerHelper.getForegroundUserInfo())) {
+            return;
+        }
         if (mShowing) {
             return;
         }