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

Commit 73c1fc2d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "new-intent-navUp-sc" into sc-qpr1-dev 

* changes:
  [automerge] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 2p: 89ebc8c4
  [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo
parents 718dba1e 217adae9

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

+17 −1
Original line number Diff line number Diff line
@@ -7030,7 +7030,23 @@ class Task extends WindowContainer<WindowContainer> { 
                    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(