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

Commit 726dea31 authored by Yuri Lin's avatar Yuri Lin Committed by Android (Google) Code Review
Browse files

Merge "For headless system, also include UID_HEADLESS in current UIDs." into main

parents 8bf9e5e1 b1bf9ab5
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -324,7 +324,11 @@ public class PreferencesHelperTest extends UiServiceTestCase {
        when(mPermissionHelper.getNotificationPermissionValues(USER_SYSTEM))
                .thenReturn(appPermissions);

        when(mUserProfiles.getCurrentProfileIds()).thenReturn(IntArray.wrap(new int[] {0}));
        IntArray currentProfileIds = IntArray.wrap(new int[]{0});
        if (UserManager.isHeadlessSystemUserMode()) {
            currentProfileIds.add(UserHandle.getUserId(UID_HEADLESS));
        }
        when(mUserProfiles.getCurrentProfileIds()).thenReturn(currentProfileIds);

        mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper,
                mPermissionHelper, mPermissionManager, mLogger, mAppOpsManager, mUserProfiles,