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

Commit a0b52cfd authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing ShortcutManager Tests after new userproperty" into main

parents 76024f7e 844345f1

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

+23 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ import android.content.pm.SigningDetails; 
import android.content.pm.SigningInfo;

import android.content.pm.UserInfo;

import android.content.pm.UserPackage;

import android.content.pm.UserProperties;

import android.content.res.Resources;

import android.content.res.XmlResourceParser;

import android.graphics.drawable.Icon;
@@ -776,6 +777,15 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { 
            new UserInfo(USER_P1, "userP1",

                    UserInfo.FLAG_INITIALIZED | UserInfo.FLAG_MANAGED_PROFILE), 0);



    protected static final UserProperties USER_PROPERTIES_0 =

            new UserProperties.Builder().setItemsRestrictedOnHomeScreen(false).build();



    protected static final UserProperties USER_PROPERTIES_10 =

            new UserProperties.Builder().setItemsRestrictedOnHomeScreen(false).build();



    protected static final UserProperties USER_PROPERTIES_11 =

            new UserProperties.Builder().setItemsRestrictedOnHomeScreen(true).build();



    protected BiPredicate<String, Integer> mDefaultLauncherChecker =

            (callingPackage, userId) ->

            LAUNCHER_1.equals(callingPackage) || LAUNCHER_2.equals(callingPackage)
@@ -817,6 +827,7 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { 
            = new HashMap<>();



    protected final Map<Integer, UserInfo> mUserInfos = new HashMap<>();

    protected final Map<Integer, UserProperties> mUserProperties = new HashMap<>();

    protected final Map<Integer, Boolean> mRunningUsers = new HashMap<>();

    protected final Map<Integer, Boolean> mUnlockedUsers = new HashMap<>();
@@ -911,6 +922,9 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { 
        mUserInfos.put(USER_11, USER_INFO_11);

        mUserInfos.put(USER_P0, USER_INFO_P0);

        mUserInfos.put(USER_P1, USER_INFO_P1);

        mUserProperties.put(USER_0, USER_PROPERTIES_0);

        mUserProperties.put(USER_10, USER_PROPERTIES_10);

        mUserProperties.put(USER_11, USER_PROPERTIES_11);



        when(mMockUserManagerInternal.isUserUnlockingOrUnlocked(anyInt()))

                .thenAnswer(inv -> {
@@ -959,6 +973,15 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { 
                inv -> mUserInfos.get((Integer) inv.getArguments()[0])));

        when(mMockActivityManagerInternal.getUidProcessState(anyInt())).thenReturn(

                ActivityManager.PROCESS_STATE_CACHED_EMPTY);

        when(mMockUserManagerInternal.getUserProperties(anyInt()))

                .thenAnswer(inv -> {

                    final int userId = (Integer) inv.getArguments()[0];

                    final UserProperties userProperties = mUserProperties.get(userId);

                    if (userProperties == null) {

                        return new UserProperties.Builder().build();

                    }

                    return userProperties;

                });



        // User 0 and P0 are always running

        mRunningUsers.put(USER_0, true);