Merge "Robolectric upgrade" into main am: 71b2be5571

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3185301

Change-Id: I9469f534e375c589f0a7dbac20f185f61ae69295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ram Peri
2024-07-23 01:08:54 +00:00
committed by Automerger Merge Worker

View File

@@ -19,9 +19,8 @@ package com.android.settings.testutils.shadow;
import android.Manifest;
import android.content.Context;
import android.content.pm.CrossProfileApps;
import android.content.pm.ICrossProfileApps;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageInfo;
import androidx.annotation.NonNull;
@@ -35,15 +34,7 @@ import java.util.Set;
@Implements(CrossProfileApps.class)
public class ShadowCrossProfileApps extends org.robolectric.shadows.ShadowCrossProfileApps {
private static final Set<String> configurableInteractAcrossProfilePackages = new HashSet<>();
private Context mContext;
private PackageManager mPackageManager;
@Implementation
protected void __constructor__(Context context, ICrossProfileApps service) {
super.__constructor__(context, service);
this.mContext = context;
this.mPackageManager = context.getPackageManager();
}
public void addCrossProfilePackage(String packageName) {
configurableInteractAcrossProfilePackages.add(packageName);
}
@@ -57,7 +48,9 @@ public class ShadowCrossProfileApps extends org.robolectric.shadows.ShadowCrossP
protected boolean canUserAttemptToConfigureInteractAcrossProfiles(@NonNull String packageName) {
PackageInfo packageInfo;
try {
packageInfo = mPackageManager.getPackageInfo(packageName, /* flags= */ 0);
packageInfo = getContext().getPackageManager().getPackageInfo(
packageName,
/* flags= */ 0);
} catch (PackageManager.NameNotFoundException e) {
return false;
}