diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2016-03-17 03:24:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-17 03:24:30 +0000 |
| commit | e6031bfdd4f96537d30e9529ba3f3a72c8347d62 (patch) | |
| tree | a3bb38926e2c65e226d46f371b5ee4d167e7548d /core/java | |
| parent | fb8aa06883faae598512c26d95c5dfeab7f213a5 (diff) | |
| parent | 7410fb4b394c46fcaa195ba1071750469f776c80 (diff) | |
Merge "Oops, missed a default Bundle flag." into nyc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/Bundle.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java index f334e77cfbe6..1097cadd55dc 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; } |