From 8ad27b4ab8bc802d5c5b564db29ab72dfb0c5ab3 Mon Sep 17 00:00:00 2001 From: Joshua Trask Date: Wed, 7 Jun 2023 18:58:21 +0000 Subject: Clean up ResolverActivity.getResolveInfoUserHandle This function was a shim to read from ResolveInfo.userHandle, which we added as a stopgap to unblock development on cloned-app support before the field was actually populated from PackageManager (since we could make reasonable "predictions" for the right value with logic based on our own application UI). The PackageManager support has since caught up, so this has been inlined to use the "real" field and we can now remove the shim. This CL also extends ResolverDataProvider to set userHandles in the fake ResolveInfo instances we build for our tests. That wasn't necessary to get our current tests to pass, but since we have logic that depends on these fields, it seemed preferable to provide plausible values that would better reflect any future issues. Bug: 273294251 Test: IntentResolverUnitTests, CtsSharesheetDeviceTest Change-Id: I541220f9e3ab945a1753cda0f8a53f22ab708876 --- .../intentresolver/ResolverDataProvider.java | 28 ++++++++++------------ 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'java/tests') diff --git a/java/tests/src/com/android/intentresolver/ResolverDataProvider.java b/java/tests/src/com/android/intentresolver/ResolverDataProvider.java index 688dd867..1f8d9bee 100644 --- a/java/tests/src/com/android/intentresolver/ResolverDataProvider.java +++ b/java/tests/src/com/android/intentresolver/ResolverDataProvider.java @@ -103,30 +103,26 @@ public class ResolverDataProvider { } public static ResolveInfo createResolveInfo(int i, int userId) { - final ResolveInfo resolveInfo = new ResolveInfo(); - resolveInfo.activityInfo = createActivityInfo(i); - resolveInfo.targetUserId = userId; - return resolveInfo; + return createResolveInfo(i, userId, UserHandle.of(userId)); } + public static ResolveInfo createResolveInfo(int i, int userId, UserHandle resolvedForUser) { - final ResolveInfo resolveInfo = new ResolveInfo(); - resolveInfo.activityInfo = createActivityInfo(i); - resolveInfo.targetUserId = userId; - resolveInfo.userHandle = resolvedForUser; - return resolveInfo; + return createResolveInfo(createActivityInfo(i), userId, resolvedForUser); } public static ResolveInfo createResolveInfo(ComponentName componentName, int userId) { - final ResolveInfo resolveInfo = new ResolveInfo(); - resolveInfo.activityInfo = createActivityInfo(componentName); - resolveInfo.targetUserId = userId; - return resolveInfo; + return createResolveInfo(componentName, userId, UserHandle.of(userId)); } - public static ResolveInfo createResolveInfo(ComponentName componentName, int userId, - UserHandle resolvedForUser) { + public static ResolveInfo createResolveInfo( + ComponentName componentName, int userId, UserHandle resolvedForUser) { + return createResolveInfo(createActivityInfo(componentName), userId, resolvedForUser); + } + + public static ResolveInfo createResolveInfo( + ActivityInfo activityInfo, int userId, UserHandle resolvedForUser) { final ResolveInfo resolveInfo = new ResolveInfo(); - resolveInfo.activityInfo = createActivityInfo(componentName); + resolveInfo.activityInfo = activityInfo; resolveInfo.targetUserId = userId; resolveInfo.userHandle = resolvedForUser; return resolveInfo; -- cgit v1.2.3-59-g8ed1b