Merge "Enforce the cross-profile intent check." (f0f598a7) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -12328,6 +12328,7 @@ package android.content.pm {
		method public int describeContents();
		method public void dump(android.util.Printer, String);
		method public final int getIconResource();
		method public boolean isCrossProfileIntentForwarderActivity();
		method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
		method public CharSequence loadLabel(android.content.pm.PackageManager);
		method public void writeToParcel(android.os.Parcel, int);

+12 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,8 @@ import java.util.Comparator;
		*/
		public class ResolveInfo implements Parcelable {
		private static final String TAG = "ResolveInfo";
		private static final String INTENT_FORWARDER_ACTIVITY =
		"com.android.internal.app.IntentForwarderActivity";

		/**
		* The activity or broadcast receiver that corresponds to this resolution
		@@ -351,6 +353,16 @@ public class ResolveInfo implements Parcelable {
		}
		}

		/**
		* Returns whether this resolution represents the intent forwarder activity.
		*
		* @return whether this resolution represents the intent forwarder activity
		*/
		public boolean isCrossProfileIntentForwarderActivity() {
		return activityInfo != null
		&& INTENT_FORWARDER_ACTIVITY.equals(activityInfo.targetActivity);
		}

		public ResolveInfo() {
		targetUserId = UserHandle.USER_CURRENT;
		}