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

Commit 75c1b0e0 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Do not send new Intent to non-exported activity when navigateUpTo" into... 

Merge "Do not send new Intent to non-exported activity when navigateUpTo" into tm-qpr-dev am: df4e467f am: aea53a16

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19492656



Change-Id: I21a8d3c1a7233a5dc9a48add4cb976f7a78f32bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b3f3357 aea53a16

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

+17 −1
Original line number Diff line number Diff line
@@ -5319,7 +5319,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) {

                    Slog.e(TAG, "Cannot navigateUpTo, intent =" + destIntent);

                    foundParentInTask = false;

                } else {

                    parent.deliverNewIntentLocked(callingUid, destIntent, destGrants,

                            srec.packageName);

                }

            } else {

                try {

                    ActivityInfo aInfo = AppGlobals.getPackageManager().getActivityInfo(