Merge "[2/2] Fix sharing to another profile where an app has multiple targets" into tm-qpr-dev (dd4fc6db) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/chooser/DisplayResolveInfo.java

+2 −9

Original line number	Diff line number	Diff line
		@@ -172,14 +172,14 @@ public class DisplayResolveInfo implements TargetInfo, Parcelable {

		@Override
		public boolean startAsCaller(ResolverActivity activity, Bundle options, int userId) {
		prepareIntentForCrossProfileLaunch(mResolvedIntent, userId);
		TargetInfo.prepareIntentForCrossProfileLaunch(mResolvedIntent, userId);
		activity.startActivityAsCaller(mResolvedIntent, options, false, userId);
		return true;
		}

		@Override
		public boolean startAsUser(Activity activity, Bundle options, UserHandle user) {
		prepareIntentForCrossProfileLaunch(mResolvedIntent, user.getIdentifier());
		TargetInfo.prepareIntentForCrossProfileLaunch(mResolvedIntent, user.getIdentifier());
		activity.startActivityAsUser(mResolvedIntent, options, user);
		return false;
		}
		@@ -224,13 +224,6 @@ public class DisplayResolveInfo implements TargetInfo, Parcelable {
		}
		};

		private static void prepareIntentForCrossProfileLaunch(Intent intent, int targetUserId) {
		final int currentUserId = UserHandle.myUserId();
		if (targetUserId != currentUserId) {
		intent.fixUris(currentUserId);
		}
		}

		private DisplayResolveInfo(Parcel in) {
		mDisplayLabel = in.readCharSequence();
		mExtendedInfo = in.readCharSequence();

+1 −0

Original line number	Diff line number	Diff line
		@@ -232,6 +232,7 @@ public final class SelectableTargetInfo implements ChooserTargetInfo {
		}
		intent.setComponent(mChooserTarget.getComponentName());
		intent.putExtras(mChooserTarget.getIntentExtras());
		TargetInfo.prepareIntentForCrossProfileLaunch(intent, userId);

		// Important: we will ignore the target security checks in ActivityManager
		// if and only if the ChooserTarget's target package is the same package

+11 −0

Original line number	Diff line number	Diff line
		@@ -130,4 +130,15 @@ public interface TargetInfo {
		* @return true if this target should be pinned to the front by the request of the user
		*/
		boolean isPinned();

		/**
		* Fix the URIs in {@code intent} if cross-profile sharing is required. This should be called
		* before launching the intent as another user.
		*/
		static void prepareIntentForCrossProfileLaunch(Intent intent, int targetUserId) {
		final int currentUserId = UserHandle.myUserId();
		if (targetUserId != currentUserId) {
		intent.fixUris(currentUserId);
		}
		}
		}