Merge "Remove ChooserTargetServiceConnection from adapter" (c4c62694) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -495,7 +495,7 @@ public class ChooserActivity extends ResolverActivity implements
		if (adapterForUserHandle != null) {
		adapterForUserHandle.addServiceResults(sri.originalTarget,
		sri.resultTargets, TARGET_TYPE_CHOOSER_TARGET,
		/* directShareShortcutInfoCache */ null, mServiceConnections);
		/* directShareShortcutInfoCache */ null);
		if (!sri.resultTargets.isEmpty() && sri.originalTarget != null) {
		mChooserTargetComponentNameCache.put(
		sri.resultTargets.get(0).getComponentName(),
		@@ -528,7 +528,7 @@ public class ChooserActivity extends ResolverActivity implements
		if (adapterForUserHandle != null) {
		adapterForUserHandle.addServiceResults(
		resultInfo.originalTarget, resultInfo.resultTargets, msg.arg1,
		mDirectShareShortcutInfoCache, mServiceConnections);
		mDirectShareShortcutInfoCache);
		}
		}
		break;
		@@ -1649,7 +1649,7 @@ public class ChooserActivity extends ResolverActivity implements
		/* origTarget */ null,
		Lists.newArrayList(mCallerChooserTargets),
		TARGET_TYPE_DEFAULT,
		/* directShareShortcutInfoCache */ null, mServiceConnections);
		/* directShareShortcutInfoCache */ null);
		}
		}

core/java/com/android/internal/app/ChooserListAdapter.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -491,9 +491,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
		*/
		public void addServiceResults(DisplayResolveInfo origTarget, List<ChooserTarget> targets,
		@ChooserActivity.ShareTargetType int targetType,
		Map<ChooserTarget, ShortcutInfo> directShareToShortcutInfos,
		List<ChooserActivity.ChooserTargetServiceConnection>
		pendingChooserTargetServiceConnections) {
		Map<ChooserTarget, ShortcutInfo> directShareToShortcutInfos) {
		if (DEBUG) {
		Log.d(TAG, "addServiceResults " + origTarget.getResolvedComponentName() + ", "
		+ targets.size()

core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java

+6 −12

Original line number	Diff line number	Diff line
		@@ -1162,8 +1162,7 @@ public class ChooserActivityTest {
		/* resolveInfoPresentationGetter */ null),
		serviceTargets,
		TARGET_TYPE_CHOOSER_TARGET,
		directShareToShortcutInfos,
		List.of())
		directShareToShortcutInfos)
		);

		// Thread.sleep shouldn't be a thing in an integration test but it's
		@@ -1234,8 +1233,7 @@ public class ChooserActivityTest {
		/* resolveInfoPresentationGetter */ null),
		serviceTargets,
		TARGET_TYPE_CHOOSER_TARGET,
		directShareToShortcutInfos,
		List.of())
		directShareToShortcutInfos)
		);
		// Thread.sleep shouldn't be a thing in an integration test but it's
		// necessary here because of the way the code is structured
		@@ -1305,8 +1303,7 @@ public class ChooserActivityTest {
		/* resolveInfoPresentationGetter */ null),
		serviceTargets,
		TARGET_TYPE_SHORTCUTS_FROM_PREDICTION_SERVICE,
		directShareToShortcutInfos,
		List.of())
		directShareToShortcutInfos)
		);
		// Thread.sleep shouldn't be a thing in an integration test but it's
		// necessary here because of the way the code is structured
		@@ -1366,8 +1363,7 @@ public class ChooserActivityTest {
		/* resolveInfoPresentationGetter */ null),
		serviceTargets,
		TARGET_TYPE_SHORTCUTS_FROM_PREDICTION_SERVICE,
		directShareToShortcutInfos,
		List.of())
		directShareToShortcutInfos)
		);
		// Thread.sleep shouldn't be a thing in an integration test but it's
		// necessary here because of the way the code is structured
		@@ -1442,8 +1438,7 @@ public class ChooserActivityTest {
		/* resolveInfoPresentationGetter */ null),
		serviceTargets,
		TARGET_TYPE_CHOOSER_TARGET,
		directShareToShortcutInfos,
		List.of())
		directShareToShortcutInfos)
		);
		// Thread.sleep shouldn't be a thing in an integration test but it's
		// necessary here because of the way the code is structured
		@@ -1806,8 +1801,7 @@ public class ChooserActivityTest {
		/* resolveInfoPresentationGetter */ null),
		serviceTargets,
		TARGET_TYPE_CHOOSER_TARGET,
		directShareToShortcutInfos,
		null)
		directShareToShortcutInfos)
		);
		// Thread.sleep shouldn't be a thing in an integration test but it's
		// necessary here because of the way the code is structured