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

Merge "Oops, missed a default Bundle flag." into nyc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2016-03-17 03:24:28 +00:00
committed by Android (Google) Code Review
parent fb8aa06883 7410fb4b39
commit e6031bfdd4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/os/Bundle.java
View File

@@ -51,7 +51,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable {
*/ */
public Bundle() { public Bundle() {
super(); 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) { Bundle(Parcel parcelledData) {
super(parcelledData); super(parcelledData);
mFlags = FLAG_HAS_FDS_KNOWN; mFlags = FLAG_HAS_FDS_KNOWN | FLAG_ALLOW_FDS;
if (mParcelledData.hasFileDescriptors()) { if (mParcelledData.hasFileDescriptors()) {
mFlags |= FLAG_HAS_FDS; mFlags |= FLAG_HAS_FDS;
} }
@@ -70,7 +70,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable {
/* package */ Bundle(Parcel parcelledData, int length) { /* package */ Bundle(Parcel parcelledData, int length) {
super(parcelledData, length); super(parcelledData, length);
mFlags = FLAG_HAS_FDS_KNOWN; mFlags = FLAG_HAS_FDS_KNOWN | FLAG_ALLOW_FDS;
if (mParcelledData.hasFileDescriptors()) { if (mParcelledData.hasFileDescriptors()) {
mFlags |= FLAG_HAS_FDS; mFlags |= FLAG_HAS_FDS;
} }
@@ -85,7 +85,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable {
*/ */
public Bundle(ClassLoader loader) { public Bundle(ClassLoader loader) {
super(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) { public Bundle(int capacity) {
super(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) { public Bundle(PersistableBundle b) {
super(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 @Override
public void clear() { public void clear() {
super.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) { public void readFromParcel(Parcel parcel) {
super.readFromParcelInner(parcel); super.readFromParcelInner(parcel);
mFlags = FLAG_HAS_FDS_KNOWN; mFlags = FLAG_HAS_FDS_KNOWN | FLAG_ALLOW_FDS;
if (mParcelledData.hasFileDescriptors()) { if (mParcelledData.hasFileDescriptors()) {
mFlags |= FLAG_HAS_FDS; mFlags |= FLAG_HAS_FDS;
} }