Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f1ebb5d authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

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

am: d4306fd5

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

Change-Id: I6a0431d4231c3aad55161fa46ccb3fb420dff3ae
parents 13f295ed d4306fd5

core/java/android/os/Bundle.java

+16 −0
Original line number Diff line number Diff line
@@ -227,6 +227,18 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { 
        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.

     *
@@ -308,6 +320,8 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { 


            if (fdFound) {

                mFlags |= FLAG_HAS_FDS;

            } else {

                mFlags &= ~FLAG_HAS_FDS;

            }

            mFlags |= FLAG_HAS_FDS_KNOWN;

        }
@@ -335,6 +349,8 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { 
                mMap.removeAt(i);

            }

        }

        mFlags |= FLAG_HAS_FDS_KNOWN;

        mFlags &= ~FLAG_HAS_FDS;

    }



    /**