Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check EXTRA_INTENT as part of leaving process."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-24 18:49:19 +00:00
committed by Android (Google) Code Review
parent a6be43461e c6fe23df52
commit 4b2f751ebf
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/content/Intent.java
View File

@@ -9269,6 +9269,13 @@ public class Intent implements Parcelable, Cloneable {
mClipData.prepareToLeaveProcess(leavingPackage, getFlags());
}
if (mExtras != null && !mExtras.isParcelled()) {
final Object intent = mExtras.get(Intent.EXTRA_INTENT);
if (intent instanceof Intent) {
((Intent) intent).prepareToLeaveProcess(leavingPackage);
}
}
if (mAction != null && mData != null && StrictMode.vmFileUriExposureEnabled()
&& leavingPackage) {
switch (mAction) {