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

Commit 01d4ca8a authored by Fengjiang Li's avatar Fengjiang Li Committed by Android (Google) Code Review
Browse files

Merge "Use global PackageManagerHelper for LoaderTask" into main

parents b7cd6723 62f1eca9

src/com/android/launcher3/model/LoaderTask.java

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ public class LoaderTask implements Runnable { 
        mLauncherApps = mApp.getContext().getSystemService(LauncherApps.class);

        mUserManager = mApp.getContext().getSystemService(UserManager.class);

        mUserCache = UserCache.INSTANCE.get(mApp.getContext());

        mPmHelper = new PackageManagerHelper(mApp.getContext());

        mPmHelper = PackageManagerHelper.INSTANCE.get(mApp.getContext());

        mSessionHelper = InstallSessionHelper.INSTANCE.get(mApp.getContext());

        mIconCache = mApp.getIconCache();

        mUserManagerState = userManagerState;

tests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Intent 
import android.content.pm.LauncherApps

import android.content.pm.PackageInstaller

import android.content.pm.ShortcutInfo

import android.os.Process

import android.os.UserHandle

import android.platform.test.annotations.EnableFlags

import android.util.LongSparseArray
@@ -429,6 +430,7 @@ class WorkspaceItemProcessorTest { 
                whenever(disabledMessage).thenReturn("")

                whenever(disabledReason).thenReturn(0)

                whenever(persons).thenReturn(EMPTY_PERSON_ARRAY)

                whenever(userHandle).thenReturn(Process.myUserHandle())

            }

        mIconRequestInfos = mutableListOf()

        // Make sure shortcuts map has expected key from expected package