From 3cc84671cbd366ed317460f920c497d0c6987b91 Mon Sep 17 00:00:00 2001 From: Yasin Kilicdere Date: Fri, 30 Jun 2023 15:52:54 +0100 Subject: [PATCH] Put the current user to mUsers in UserManagerServiceTest. Because of the way we construct UMS from UserManagerServiceTest, it can not populate mUsers with existing users. Because it can not find userlist.xml and fallback to single user. And the test methods which try to set a restriction for the current user fail because UMS.setUserRestriction fails with "Cannot set user restriction no_user_switch. User with id 10 does not exist." error. We're fixing this issue by manually adding the current user to UMS.mUsers via mUserManagerService.putUserInfo() method. Bug: 289517147 Test: atest UserManagerServiceTest Change-Id: I6d17fe1fc34408acde8f6b7233a7cf96a5dbfa45 --- .../src/com/android/server/pm/UserManagerServiceTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceTest.java index 4af0323122ca9..592be2d83aeea 100644 --- a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceTest.java @@ -70,6 +70,9 @@ public class UserManagerServiceTest { LocalServices.removeServiceForTest(UserManagerInternal.class); mUserManagerService = new UserManagerService(InstrumentationRegistry.getContext()); + // Put the current user to mUsers. UMS can't find userlist.xml, and fallbackToSingleUserLP. + mUserManagerService.putUserInfo( + new UserInfo(ActivityManager.getCurrentUser(), "Current User", 0)); restrictionsFile = new File(mContext.getCacheDir(), "restrictions.xml"); restrictionsFile.delete();