Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34f72608 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity... 

Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev
parents 192f2e63 834812c4

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

+17 −1
Original line number Original line Diff line number Diff line
@@ -2407,7 +2407,23 @@ class ActivityStack extends Task { 
                    parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TASK ||

                    parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TASK ||

                    parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TOP ||

                    parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TOP ||

                    (destIntentFlags & Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) {

                    (destIntentFlags & Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) {

                parent.deliverNewIntentLocked(callingUid, destIntent, destGrants, srec.packageName);

                boolean abort;

                try {

                    abort = !mStackSupervisor.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 {

            } else {

                try {

                try {

                    ActivityInfo aInfo = AppGlobals.getPackageManager().getActivityInfo(

                    ActivityInfo aInfo = AppGlobals.getPackageManager().getActivityInfo(