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

Commit f3eb2e2b authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 9e652c30: am 9b2a0f16: Merge "Fix a bug with updating extras in a... 

am 9e652c30: am 9b2a0f16: Merge "Fix a bug with updating extras in a PendingIntent with an intent stack" into jb-dev

* commit '9e652c30':
  Fix a bug with updating extras in a PendingIntent with an intent stack
parents 22c415a3 9e652c30

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

+2 −1
Original line number Diff line number Diff line
@@ -4376,7 +4376,8 @@ public final class ActivityManagerService extends ActivityManagerNative 
            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;