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

Merge "Handle interaction of Bundle.hasFileDescriptors() with removal" into nyc-dev

Browse Source 
am: 1486557

* commit '1486557d10f9969ef31b65e4312bd00b1a6f02ae':
  Handle interaction of Bundle.hasFileDescriptors() with removal

Change-Id: I3e1d35c5fbd6ad2356abe61309f8b6797f3fbbba
This commit is contained in:
Christopher Tate
2016-03-31 22:28:32 +00:00
committed by android-build-merger
parent 9da7bb7584 1486557d10
commit d4306fd590
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,6 +207,18 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable {
mFlags = FLAG_HAS_FDS_KNOWN | FLAG_ALLOW_FDS; mFlags = FLAG_HAS_FDS_KNOWN | FLAG_ALLOW_FDS;
} }
/**
* Removes any entry with the given key from the mapping of this Bundle.
*
* @param key a String key
*/
public void remove(String key) {
super.remove(key);
if ((mFlags & FLAG_HAS_FDS) != 0) {
mFlags &= ~FLAG_HAS_FDS_KNOWN;
}
}
/** /**
* Inserts all mappings from the given Bundle into this Bundle. * Inserts all mappings from the given Bundle into this Bundle.
* *
@@ -288,6 +300,8 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable {
if (fdFound) { if (fdFound) {
mFlags |= FLAG_HAS_FDS; mFlags |= FLAG_HAS_FDS;
} else {
mFlags &= ~FLAG_HAS_FDS;
} }
mFlags |= FLAG_HAS_FDS_KNOWN; mFlags |= FLAG_HAS_FDS_KNOWN;
} }
@@ -315,6 +329,8 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable {
mMap.removeAt(i); mMap.removeAt(i);
} }
} }
mFlags |= FLAG_HAS_FDS_KNOWN;
mFlags &= ~FLAG_HAS_FDS;
} }
/** /**