From 69de7e1a4ee9455ecd5a4aedfb6e5c395364dbbe Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Mon, 7 May 2012 18:42:24 -0700 Subject: 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 --- services/java/com/android/server/am/ActivityManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 1f7aeb0b4deb..0f8d151d9c83 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -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( -- cgit v1.2.3-59-g8ed1b