Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78be599d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Put the current user to mUsers in UserManagerServiceTest." into... 

Merge "Put the current user to mUsers in UserManagerServiceTest." into udc-qpr-dev am: 837bd198 am: 49df3294

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23874249



Change-Id: I84f4dac09d4411b73f6be5a1c2f2cfa69cb7b798
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aa90c193 49df3294

services/tests/servicestests/src/com/android/server/pm/UserManagerServiceTest.java

+3 −0
Original line number Diff line number Diff line
@@ -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();