Merge "Do not send new Intent to non-exported activity when navigateUpTo" into tm-dev (12d6101d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/Task.java

+17 −1

Original line number	Diff line number	Diff line
		@@ -5457,7 +5457,23 @@ class Task extends TaskFragment {
		parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TASK \|\|
		parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TOP \|\|
		(destIntentFlags & Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) {
		parent.deliverNewIntentLocked(callingUid, destIntent, destGrants, srec.packageName);
		boolean abort;
		try {
		abort = !mTaskSupervisor.checkStartAnyActivityPermission(destIntent,
		parent.info, null /* resultWho /, -1 / requestCode */, srec.getPid(),
		callingUid, srec.info.packageName, null /* callingFeatureId */,
		false /* ignoreTargetSecurity /, false / launchingInTask */, srec.app,
		null /* resultRecord /, null / resultRootTask */);
		} catch (SecurityException e) {
		abort = true;
		}
		if (abort) {
		android.util.EventLog.writeEvent(0x534e4554, "238605611", callingUid, "");
		foundParentInTask = false;
		} else {
		parent.deliverNewIntentLocked(callingUid, destIntent, destGrants,
		srec.packageName);
		}
		} else {
		try {
		ActivityInfo aInfo = AppGlobals.getPackageManager().getActivityInfo(