commit | 851ec49de73913547a51476e9c80cccfd7c15572 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Wed Oct 12 17:20:07 2016 -0700 |
committer | Dianne Hackborn <hackbod@google.com> | Wed Oct 12 18:17:58 2016 -0700 |
tree | d7b83c3c48bf94206da2342db60166d77f825ce8 | |
parent | 5c8fc588508a5f4ecf6f19a9b014e6462eb2db23 [diff] [blame] |
Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle We now recursively generate new Bundle objects if we need to do any stripping. Change-Id: I4ca7896a0771c25264591ae7c79df85816d630d4
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index cf6880a..c6aaa48 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java
@@ -6573,7 +6573,7 @@ */ public void removeUnsafeExtras() { if (mExtras != null) { - mExtras.filterValues(); + mExtras = mExtras.filterValues(); } }