Skip to content

Commit 69de7e1

Browse files
committed
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
1 parent 29bb27e commit 69de7e1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13484,7 +13484,7 @@ public boolean navigateUpTo(IBinder token, Intent destIntent, int resultCode,
1348413484
parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TASK ||
1348513485
parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TOP ||
1348613486
(destIntentFlags & Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) {
13487-
parent.deliverNewIntentLocked(srec.app.uid, destIntent);
13487+
parent.deliverNewIntentLocked(srec.info.applicationInfo.uid, destIntent);
1348813488
} else {
1348913489
try {
1349013490
ActivityInfo aInfo = AppGlobals.getPackageManager().getActivityInfo(

0 commit comments

Comments
 (0)