From 7410fb4b394c46fcaa195ba1071750469f776c80 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Wed, 16 Mar 2016 21:23:29 -0600 Subject: [PATCH] Oops, missed a default Bundle flag. Bug: 27706598 Change-Id: Idde1c25ea1b5944657075cd5f0da65396280f757 --- core/java/android/os/Bundle.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java index f334e77cfbe69..1097cadd55dc4 100644 --- a/core/java/android/os/Bundle.java +++ b/core/java/android/os/Bundle.java @@ -51,7 +51,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { */ public Bundle() { super(); - mFlags = FLAG_HAS_FDS_KNOWN; + mFlags = FLAG_HAS_FDS_KNOWN | FLAG_ALLOW_FDS; } /** @@ -62,7 +62,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { */ Bundle(Parcel parcelledData) { super(parcelledData); - mFlags = FLAG_HAS_FDS_KNOWN; + mFlags = FLAG_HAS_FDS_KNOWN | FLAG_ALLOW_FDS; if (mParcelledData.hasFileDescriptors()) { mFlags |= FLAG_HAS_FDS; } @@ -70,7 +70,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { /* package */ Bundle(Parcel parcelledData, int length) { super(parcelledData, length); - mFlags = FLAG_HAS_FDS_KNOWN; + mFlags = FLAG_HAS_FDS_KNOWN | FLAG_ALLOW_FDS; if (mParcelledData.hasFileDescriptors()) { mFlags |= FLAG_HAS_FDS; } @@ -85,7 +85,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { */ public Bundle(ClassLoader loader) { super(loader); - mFlags = FLAG_HAS_FDS_KNOWN; + mFlags = FLAG_HAS_FDS_KNOWN | FLAG_ALLOW_FDS; } /** @@ -96,7 +96,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { */ public Bundle(int capacity) { super(capacity); - mFlags = FLAG_HAS_FDS_KNOWN; + mFlags = FLAG_HAS_FDS_KNOWN | FLAG_ALLOW_FDS; } /** @@ -118,7 +118,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { */ public Bundle(PersistableBundle b) { super(b); - mFlags = FLAG_HAS_FDS_KNOWN; + mFlags = FLAG_HAS_FDS_KNOWN | FLAG_ALLOW_FDS; } /** @@ -196,7 +196,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { @Override public void clear() { super.clear(); - mFlags = FLAG_HAS_FDS_KNOWN; + mFlags = FLAG_HAS_FDS_KNOWN | FLAG_ALLOW_FDS; } /** @@ -1122,7 +1122,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { */ public void readFromParcel(Parcel parcel) { super.readFromParcelInner(parcel); - mFlags = FLAG_HAS_FDS_KNOWN; + mFlags = FLAG_HAS_FDS_KNOWN | FLAG_ALLOW_FDS; if (mParcelledData.hasFileDescriptors()) { mFlags |= FLAG_HAS_FDS; }