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

Commit 69de7e1a authored by Adam Powell's avatar Adam Powell
Browse files

Fix a bug in ActivityManagerService#navigateUpTo 

Deliver new intents to an existing parent from the calling uid obtained from
the applicationInfo instead of the process record, since the process record
might be dead.

Stoopid monkeys.

Bug 6328725

Change-Id: I4371a5705ccd7004f0dfe11da7c48d1563fb8dac
parent 29bb27ef

services/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -13484,7 +13484,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                        parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TASK ||

                        parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TOP ||

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

                    parent.deliverNewIntentLocked(srec.app.uid, destIntent);

                    parent.deliverNewIntentLocked(srec.info.applicationInfo.uid, destIntent);

                } else {

                    try {

                        ActivityInfo aInfo = AppGlobals.getPackageManager().getActivityInfo(