am 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue #22516282:... (587f0c58) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -3977,16 +3977,24 @@ public class Activity extends ContextThemeWrapper
		* as intermediaries that dispatch their intent to the target the user selects -- to
		* do this, they must perform all security checks including permission grants as if
		* their launch had come from the original activity.
		* @param intent The Intent to start.
		* @param options ActivityOptions or null.
		* @param ignoreTargetSecurity If true, the activity manager will not check whether the
		* caller it is doing the start is, is actually allowed to start the target activity.
		* If you set this to true, you must set an explicit component in the Intent and do any
		* appropriate security checks yourself.
		* @param userId The user the new activity should run as.
		* @hide
		*/
		public void startActivityAsCaller(Intent intent, @Nullable Bundle options, int userId) {
		public void startActivityAsCaller(Intent intent, @Nullable Bundle options,
		boolean ignoreTargetSecurity, int userId) {
		if (mParent != null) {
		throw new RuntimeException("Can't be called from a child");
		}
		Instrumentation.ActivityResult ar =
		mInstrumentation.execStartActivityAsCaller(
		this, mMainThread.getApplicationThread(), mToken, this,
		intent, -1, options, userId);
		intent, -1, options, ignoreTargetSecurity, userId);
		if (ar != null) {
		mMainThread.sendActivityResult(
		mToken, mEmbeddedID, -1, ar.getResultCode(),

core/java/android/app/ActivityManagerNative.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -206,9 +206,11 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		? ProfilerInfo.CREATOR.createFromParcel(data) : null;
		Bundle options = data.readInt() != 0
		? Bundle.CREATOR.createFromParcel(data) : null;
		boolean ignoreTargetSecurity = data.readInt() != 0;
		int userId = data.readInt();
		int result = startActivityAsCaller(app, callingPackage, intent, resolvedType,
		resultTo, resultWho, requestCode, startFlags, profilerInfo, options, userId);
		resultTo, resultWho, requestCode, startFlags, profilerInfo, options,
		ignoreTargetSecurity, userId);
		reply.writeNoException();
		reply.writeInt(result);
		return true;
		@@ -2675,7 +2677,8 @@ class ActivityManagerProxy implements IActivityManager
		}
		public int startActivityAsCaller(IApplicationThread caller, String callingPackage,
		Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,
		int startFlags, ProfilerInfo profilerInfo, Bundle options, int userId) throws RemoteException {
		int startFlags, ProfilerInfo profilerInfo, Bundle options, boolean ignoreTargetSecurity,
		int userId) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		@@ -2699,6 +2702,7 @@ class ActivityManagerProxy implements IActivityManager
		} else {
		data.writeInt(0);
		}
		data.writeInt(ignoreTargetSecurity ? 1 : 0);
		data.writeInt(userId);
		mRemote.transact(START_ACTIVITY_AS_CALLER_TRANSACTION, data, reply, 0);
		reply.readException();

core/java/android/app/IActivityManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,8 @@ public interface IActivityManager extends IInterface {
		ProfilerInfo profilerInfo, Bundle options, int userId) throws RemoteException;
		public int startActivityAsCaller(IApplicationThread caller, String callingPackage,
		Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,
		int flags, ProfilerInfo profilerInfo, Bundle options, int userId) throws RemoteException;
		int flags, ProfilerInfo profilerInfo, Bundle options, boolean ignoreTargetSecurity,
		int userId) throws RemoteException;
		public WaitResult startActivityAndWait(IApplicationThread caller, String callingPackage,
		Intent intent, String resolvedType, IBinder resultTo, String resultWho,
		int requestCode, int flags, ProfilerInfo profilerInfo, Bundle options,

core/java/android/app/Instrumentation.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -1701,7 +1701,8 @@ public class Instrumentation {
		*/
		public ActivityResult execStartActivityAsCaller(
		Context who, IBinder contextThread, IBinder token, Activity target,
		Intent intent, int requestCode, Bundle options, int userId) {
		Intent intent, int requestCode, Bundle options, boolean ignoreTargetSecurity,
		int userId) {
		IApplicationThread whoThread = (IApplicationThread) contextThread;
		if (mActivityMonitors != null) {
		synchronized (mSync) {
		@@ -1725,7 +1726,7 @@ public class Instrumentation {
		.startActivityAsCaller(whoThread, who.getBasePackageName(), intent,
		intent.resolveTypeIfNeeded(who.getContentResolver()),
		token, target != null ? target.mEmbeddedID : null,
		requestCode, 0, null, options, userId);
		requestCode, 0, null, options, ignoreTargetSecurity, userId);
		checkStartActivityResult(result, intent);
		} catch (RemoteException e) {
		throw new RuntimeException("Failure from system", e);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ public class IntentForwarderActivity extends Activity {
		\|\| ChooserActivity.class.getName().equals(ri.activityInfo.name));

		try {
		startActivityAsCaller(newIntent, null, targetUserId);
		startActivityAsCaller(newIntent, null, false, targetUserId);
		} catch (RuntimeException e) {
		int launchedFromUid = -1;
		String launchedFromPackage = "?";