summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Powell <adamp@google.com> 2012-05-07 18:42:24 -0700
committer Adam Powell <adamp@google.com> 2012-05-07 18:42:24 -0700
commit69de7e1a4ee9455ecd5a4aedfb6e5c395364dbbe (patch)
tree8d02bb0bbdda323f4fea55d22cf4a310eb66d284
parent29bb27ef90564a294d506c2ffd546ba21788aeac (diff)
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
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java2
1 files changed, 1 insertions, 1 deletions
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(