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

Commit 509a70ea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Improve Bundle/PersistableBundle docs" am: 9a2a261a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1846255

Change-Id: I22cff9303a22273617bce75ddc361f59d4799e9d
parents ee05ff24 9a2a261a

core/java/android/os/Bundle.java

+7 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ import java.util.List; 
/**

 * A mapping from String keys to various {@link Parcelable} values.

 *

 * <p><b>Warning:</b> Note that {@link Bundle} is a lazy container and as such it does NOT implement

 * {@link #equals(Object)} or {@link #hashCode()}.

 *

 * @see PersistableBundle

 */

public final class Bundle extends BaseBundle implements Cloneable, Parcelable {
@@ -1230,6 +1233,10 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { 
        maybePrefillHasFds();

    }



    /**

     * Returns a string representation of the {@link Bundle} that may be suitable for debugging. It

     * won't print the internal map if its content hasn't been unparcelled.

     */

    @Override

    public synchronized String toString() {

        if (mParcelledData != null) {

core/java/android/os/PersistableBundle.java

+8 −1
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ import java.util.ArrayList; 
 * supported by this class is purposefully restricted to simple objects that can

 * safely be persisted to and restored from disk.

 *

 * <p><b>Warning:</b> Note that {@link PersistableBundle} is a lazy container and as such it does

 * NOT implement {@link #equals(Object)} or {@link #hashCode()}.

 *

 * @see Bundle

 */

public final class PersistableBundle extends BaseBundle implements Cloneable, Parcelable,
@@ -324,8 +327,12 @@ public final class PersistableBundle extends BaseBundle implements Cloneable, Pa 
        return new PersistableBundle();  // An empty mutable PersistableBundle

    }



    /**

     * Returns a string representation of the {@link PersistableBundle} that may be suitable for

     * debugging. It won't print the internal map if its content hasn't been unparcelled.

     */

    @Override

    synchronized public String toString() {

    public synchronized String toString() {

        if (mParcelledData != null) {

            if (isEmptyParcel()) {

                return "PersistableBundle[EMPTY_PARCEL]";