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

Commit 2510b375 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #35813125: API Review: android.os > Bundle 

- Renamed deepcopy to deepCopy.
- Clarified docs about when a shallow vs. deep copy happens.

Test: booted and ran

Change-Id: I2b4400770d781ff51423cd1c860454742e1d3c9c
parent 5603a16e

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -30261,7 +30261,7 @@ package android.os { 
    ctor public Bundle(android.os.Bundle);

    ctor public Bundle(android.os.PersistableBundle);

    method public java.lang.Object clone();

    method public android.os.Bundle deepcopy();

    method public android.os.Bundle deepCopy();

    method public int describeContents();

    method public android.os.IBinder getBinder(java.lang.String);

    method public android.os.Bundle getBundle(java.lang.String);
@@ -30996,7 +30996,7 @@ package android.os { 
    ctor public PersistableBundle(int);

    ctor public PersistableBundle(android.os.PersistableBundle);

    method public java.lang.Object clone();

    method public android.os.PersistableBundle deepcopy();

    method public android.os.PersistableBundle deepCopy();

    method public int describeContents();

    method public android.os.PersistableBundle getPersistableBundle(java.lang.String);

    method public void putPersistableBundle(java.lang.String, android.os.PersistableBundle);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -32863,7 +32863,7 @@ package android.os { 
    ctor public Bundle(android.os.Bundle);

    ctor public Bundle(android.os.PersistableBundle);

    method public java.lang.Object clone();

    method public android.os.Bundle deepcopy();

    method public android.os.Bundle deepCopy();

    method public int describeContents();

    method public android.os.IBinder getBinder(java.lang.String);

    method public android.os.Bundle getBundle(java.lang.String);
@@ -33619,7 +33619,7 @@ package android.os { 
    ctor public PersistableBundle(int);

    ctor public PersistableBundle(android.os.PersistableBundle);

    method public java.lang.Object clone();

    method public android.os.PersistableBundle deepcopy();

    method public android.os.PersistableBundle deepCopy();

    method public int describeContents();

    method public android.os.PersistableBundle getPersistableBundle(java.lang.String);

    method public void putPersistableBundle(java.lang.String, android.os.PersistableBundle);

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -30357,7 +30357,7 @@ package android.os { 
    ctor public Bundle(android.os.Bundle);

    ctor public Bundle(android.os.PersistableBundle);

    method public java.lang.Object clone();

    method public android.os.Bundle deepcopy();

    method public android.os.Bundle deepCopy();

    method public int describeContents();

    method public android.os.IBinder getBinder(java.lang.String);

    method public android.os.Bundle getBundle(java.lang.String);
@@ -31113,7 +31113,7 @@ package android.os { 
    ctor public PersistableBundle(int);

    ctor public PersistableBundle(android.os.PersistableBundle);

    method public java.lang.Object clone();

    method public android.os.PersistableBundle deepcopy();

    method public android.os.PersistableBundle deepCopy();

    method public int describeContents();

    method public android.os.PersistableBundle getPersistableBundle(java.lang.String);

    method public void putPersistableBundle(java.lang.String, android.os.PersistableBundle);

core/java/android/app/job/JobInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -425,8 +425,8 @@ public class JobInfo implements Parcelable { 


    private JobInfo(JobInfo.Builder b) {

        jobId = b.mJobId;

        extras = b.mExtras.deepcopy();

        transientExtras = b.mTransientExtras.deepcopy();

        extras = b.mExtras.deepCopy();

        transientExtras = b.mTransientExtras.deepCopy();

        service = b.mJobService;

        constraintFlags = b.mConstraintFlags;

        triggerContentUris = b.mTriggerContentUris != null

core/java/android/os/BaseBundle.java

+5 −5
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ public class BaseBundle { 
                    final int N = fromMap.size();

                    mMap = new ArrayMap<>(N);

                    for (int i = 0; i < N; i++) {

                        mMap.append(fromMap.keyAt(i), deepcopyValue(fromMap.valueAt(i)));

                        mMap.append(fromMap.keyAt(i), deepCopyValue(fromMap.valueAt(i)));

                    }

                }

            } else {
@@ -352,14 +352,14 @@ public class BaseBundle { 
        }

    }



    Object deepcopyValue(Object value) {

    Object deepCopyValue(Object value) {

        if (value == null) {

            return null;

        }

        if (value instanceof Bundle) {

            return ((Bundle)value).deepcopy();

            return ((Bundle)value).deepCopy();

        } else if (value instanceof PersistableBundle) {

            return ((PersistableBundle)value).deepcopy();

            return ((PersistableBundle)value).deepCopy();

        } else if (value instanceof ArrayList) {

            return deepcopyArrayList((ArrayList) value);

        } else if (value.getClass().isArray()) {
@@ -388,7 +388,7 @@ public class BaseBundle { 
        final int N = from.size();

        ArrayList out = new ArrayList(N);

        for (int i=0; i<N; i++) {

            out.add(deepcopyValue(from.get(i)));

            out.add(deepCopyValue(from.get(i)));

        }

        return out;

    }