From dee3f78318b9f5e0bec18bb1915641ae4717af54 Mon Sep 17 00:00:00 2001 From: Mark Renouf Date: Fri, 26 Jan 2024 14:52:29 -0500 Subject: Use Injected package manager consistently Fixes several places in ResolverActivity which access activity.getPackageManager() directly. This is to prepare migrating the existing depdendency override mechansim to the one provided by hilt-testing. Bug: 300157408 Test: atest IntentResolver-tests-activity Change-Id: I16052383061ff8f44d54fd3d6f9dc0d1e9809821 --- .../src/com/android/intentresolver/v2/ResolverActivity.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'java/src') diff --git a/java/src/com/android/intentresolver/v2/ResolverActivity.java b/java/src/com/android/intentresolver/v2/ResolverActivity.java index a308ea14..b8638ba4 100644 --- a/java/src/com/android/intentresolver/v2/ResolverActivity.java +++ b/java/src/com/android/intentresolver/v2/ResolverActivity.java @@ -147,6 +147,7 @@ public class ResolverActivity extends Hilt_ResolverActivity implements @Inject public ActivityLaunch mActivityLaunch; @Inject public DevicePolicyResources mDevicePolicyResources; @Inject public IntentForwarding mIntentForwarding; + @Inject public PackageManager mPackageManager; protected ActivityLogic mLogic; protected TargetDataLoader mTargetDataLoader; @@ -326,7 +327,7 @@ public class ResolverActivity extends Hilt_ResolverActivity implements } }); - boolean hasTouchScreen = getPackageManager() + boolean hasTouchScreen = mPackageManager .hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN); if (isVoiceInteraction() || !hasTouchScreen) { @@ -548,7 +549,7 @@ public class ResolverActivity extends Hilt_ResolverActivity implements ResolveInfo ri = mMultiProfilePagerAdapter.getActiveListAdapter() .resolveInfoForPosition(which, hasIndexBeenFiltered); if (mResolvingHome && hasManagedProfile() && !supportsManagedProfiles(ri)) { - String launcherName = ri.activityInfo.loadLabel(getPackageManager()).toString(); + String launcherName = ri.activityInfo.loadLabel(mPackageManager).toString(); Toast.makeText(this, mDevicePolicyResources.getWorkProfileNotSupportedMessage(launcherName), Toast.LENGTH_LONG).show(); @@ -718,7 +719,7 @@ public class ResolverActivity extends Hilt_ResolverActivity implements if (always) { final int userId = getUserId(); - final PackageManager pm = getPackageManager(); + final PackageManager pm = mPackageManager; // Set the preferred Activity pm.addUniquePreferredActivity(filter, bestMatch, set, intent.getComponent()); @@ -771,7 +772,7 @@ public class ResolverActivity extends Hilt_ResolverActivity implements null); return new ResolverListController( this, - getPackageManager(), + mPackageManager, mLogic.getTargetIntent(), mLogic.getReferrerPackageName(), mActivityLaunch.getFromUid(), @@ -1249,7 +1250,7 @@ public class ResolverActivity extends Hilt_ResolverActivity implements private boolean supportsManagedProfiles(ResolveInfo resolveInfo) { try { - ApplicationInfo appInfo = getPackageManager().getApplicationInfo( + ApplicationInfo appInfo = mPackageManager.getApplicationInfo( resolveInfo.activityInfo.packageName, 0 /* default flags */); return appInfo.targetSdkVersion >= Build.VERSION_CODES.LOLLIPOP; } catch (NameNotFoundException e) { @@ -1294,7 +1295,7 @@ public class ResolverActivity extends Hilt_ResolverActivity implements if (ri != null) { ActivityInfo activityInfo = ri.activityInfo; - boolean hasRecordPermission = getPackageManager() + boolean hasRecordPermission = mPackageManager .checkPermission(android.Manifest.permission.RECORD_AUDIO, activityInfo.packageName) == PackageManager.PERMISSION_GRANTED; -- cgit v1.2.3-59-g8ed1b