commit a479cb36d39fc6b036ef7b5aed89a7fc16c7f2ad
author Mayank Garg <gargmayank@google.com> Mon Apr 05 22:23:04 2021 -0700
committer Mayank Garg <gargmayank@google.com> Tue Apr 06 13:25:03 2021 -0700
tree 4a87fbe5e95b6848e2fbc07b88ba90c2abbf5249
parent 246652089d02a56a59598a26d26221eb618cdbf3

Update require permission tag for CarUserManager

Bug: 184292607
Test: atest CarServiceUnitTest:com.android.car.user.CarUserServiceTest
      atest CarServiceUnitTest:com.android.car.user.CarUserManagerUnitTest
      atest CarSecurityPermissionTest:com.android.car.user.CarUserManagerPermissionTest
Change-Id: I5919d0f25e9b4df32cd546bb7e40f219d7faebb0

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 b80be81..685a7ce 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -960,6 +960,10 @@
         Objects.requireNonNull(receiver);
         UserInfo targetUser = mUserManager.getUserInfo(targetUserId);
         Preconditions.checkArgument(targetUser != null, "Target user doesn't exist");
+        if (mUserManager.getUserSwitchability() != UserManager.SWITCHABILITY_STATUS_OK) {
+            sendUserSwitchResult(receiver, UserSwitchResult.STATUS_NOT_SWITCHABLE);
+            return;
+        }
         mHandler.post(()-> switchUserInternal(targetUser, timeoutMs, receiver));
     }