From f5b58ea3be34a9b9ffd711c407356a808d765b52 Mon Sep 17 00:00:00 2001 From: Ram Peri Date: Fri, 19 Jul 2024 17:23:40 -0400 Subject: [PATCH] Robolectric upgrade Test: atest SystemUIGoogleRoboRNGTests Flag: TEST_ONLY Change-Id: I833ac67223875480994f947907754290bb25c946 --- .../testutils/shadow/ShadowCrossProfileApps.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCrossProfileApps.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCrossProfileApps.java index 64a5f1169ef..c52fe2f2723 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCrossProfileApps.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCrossProfileApps.java @@ -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 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; }