commit 55c68424c2ae2ad662631143f5a2db6d57135903
author Alex Stetson <alexstetson@google.com> Fri Apr 21 09:13:04 2023 -0700
committer Alex Stetson <alexstetson@google.com> Fri Apr 21 12:00:02 2023 -0700
tree bd1255f8945a3e33f0c2c0e4ae5ee1f553ef6107
parent 9fb8f79427ed651322b43ce496b0788e1353da8f

Launch user picker on occupant zone user changes

By listening to occupant zone changes for users as well as displays, we
can ensure that the user picker is launched whenever a user is not
assigned to a particular display.

Bug: 279073946
Test: manual (standard logout CUJs, running user deletion),
atest CarUserServiceTest

Change-Id: I751ba81f2700ac53d67ede0f2f7c6d8468953ec8

service/src/com/android/car/user/CarUserService.java

diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index 2613b0f..abb25fc 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -415,12 +415,16 @@
             new ICarOccupantZoneCallback.Stub() {
                 @Override
                 public void onOccupantZoneConfigChanged(int flags) throws RemoteException {
-                    if ((flags & CarOccupantZoneManager.ZONE_CONFIG_CHANGE_FLAG_DISPLAY) != 0) {
+                    // Listen for changes to displays and user->display assignments and launch
+                    // user picker when there is no user assigned to a display. This may be a no-op
+                    // for certain cases, such as a user getting assigned to a display.
+                    if ((flags & (CarOccupantZoneManager.ZONE_CONFIG_CHANGE_FLAG_DISPLAY
+                            | CarOccupantZoneManager.ZONE_CONFIG_CHANGE_FLAG_USER)) != 0) {
                         if (DBG) {
                             String flagString = DebugUtils.flagsToString(
                                     CarOccupantZoneManager.class, "ZONE_CONFIG_CHANGE_FLAG_",
                                     flags);
-                            Slogf.d(TAG, "onOccupantZoneConfigChanged: display zone change flag=%s",
+                            Slogf.d(TAG, "onOccupantZoneConfigChanged: zone change flag=%s",
                                     flagString);
                         }
                         startUserPicker();