commit | 501d4a510f645c0b88ffa0b59fcc27c4b16a9893 | [log] [tgz] |
---|---|---|
author | Adam Powell <adamp@google.com> | Mon Apr 30 15:03:57 2012 -0700 |
committer | Adam Powell <adamp@google.com> | Mon Apr 30 15:03:57 2012 -0700 |
tree | 4e3ef5cc1bf11c229067a3af928d6786dd6bb307 | |
parent | 427db9b3d10d5c203d0351e683c3cddfd270250c [diff] [blame] |
Fix a bug with updating extras in a PendingIntent with an intent stack Change-Id: I52e2677635b588b7301dd938e1dd32f94241cf5a
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 429c3c4..37e70d9 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -4376,7 +4376,8 @@ if (!cancelCurrent) { if (updateCurrent) { if (rec.key.requestIntent != null) { - rec.key.requestIntent.replaceExtras(intents != null ? intents[0] : null); + rec.key.requestIntent.replaceExtras(intents != null ? + intents[intents.length - 1] : null); } if (intents != null) { intents[intents.length-1] = rec.key.requestIntent;