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

Commit 0a8e160e authored by Craig Mautner's avatar Craig Mautner
Browse files

Change PersistableBundle API per council's request

Fixes bug 15192573.

Change-Id: Ib98ef132c8c12e68e805cb3c0b1f7ae75940f17c
parent 3d5e5c7b
Loading
Loading
Loading
Loading
+33 −67
Original line number Diff line number Diff line
@@ -20507,6 +20507,37 @@ package android.os {
    ctor public BadParcelableException(java.lang.Exception);
  }
  public class BaseBundle {
    method public void clear();
    method public boolean containsKey(java.lang.String);
    method public java.lang.Object get(java.lang.String);
    method public double getDouble(java.lang.String);
    method public double getDouble(java.lang.String, double);
    method public double[] getDoubleArray(java.lang.String);
    method public int getInt(java.lang.String);
    method public int getInt(java.lang.String, int);
    method public int[] getIntArray(java.lang.String);
    method public long getLong(java.lang.String);
    method public long getLong(java.lang.String, long);
    method public long[] getLongArray(java.lang.String);
    method public java.lang.String getString(java.lang.String);
    method public java.lang.String getString(java.lang.String, java.lang.String);
    method public java.lang.String[] getStringArray(java.lang.String);
    method public boolean isEmpty();
    method public java.util.Set<java.lang.String> keySet();
    method public void putAll(android.os.PersistableBundle);
    method public void putDouble(java.lang.String, double);
    method public void putDoubleArray(java.lang.String, double[]);
    method public void putInt(java.lang.String, int);
    method public void putIntArray(java.lang.String, int[]);
    method public void putLong(java.lang.String, long);
    method public void putLongArray(java.lang.String, long[]);
    method public void putString(java.lang.String, java.lang.String);
    method public void putStringArray(java.lang.String, java.lang.String[]);
    method public void remove(java.lang.String);
    method public int size();
  }
  public class BatteryManager {
    ctor public BatteryManager();
    method public android.os.BatteryProperty getProperty(int) throws android.os.RemoteException;
@@ -20635,17 +20666,14 @@ package android.os {
    field public static final int L = 10000; // 0x2710
  }
  public final class Bundle extends android.os.CommonBundle {
  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
    ctor public Bundle();
    ctor public Bundle(java.lang.ClassLoader);
    ctor public Bundle(int);
    ctor public Bundle(android.os.Bundle);
    ctor public Bundle(android.os.PersistableBundle);
    method public void clear();
    method public java.lang.Object clone();
    method public boolean containsKey(java.lang.String);
    method public int describeContents();
    method public java.lang.Object get(java.lang.String);
    method public android.os.IBinder getBinder(java.lang.String);
    method public boolean getBoolean(java.lang.String);
    method public boolean getBoolean(java.lang.String, boolean);
@@ -20662,37 +20690,21 @@ package android.os {
    method public java.lang.CharSequence[] getCharSequenceArray(java.lang.String);
    method public java.util.ArrayList<java.lang.CharSequence> getCharSequenceArrayList(java.lang.String);
    method public java.lang.ClassLoader getClassLoader();
    method public double getDouble(java.lang.String);
    method public double getDouble(java.lang.String, double);
    method public double[] getDoubleArray(java.lang.String);
    method public float getFloat(java.lang.String);
    method public float getFloat(java.lang.String, float);
    method public float[] getFloatArray(java.lang.String);
    method public int getInt(java.lang.String);
    method public int getInt(java.lang.String, int);
    method public int[] getIntArray(java.lang.String);
    method public java.util.ArrayList<java.lang.Integer> getIntegerArrayList(java.lang.String);
    method public long getLong(java.lang.String);
    method public long getLong(java.lang.String, long);
    method public long[] getLongArray(java.lang.String);
    method public T getParcelable(java.lang.String);
    method public android.os.Parcelable[] getParcelableArray(java.lang.String);
    method public java.util.ArrayList<T> getParcelableArrayList(java.lang.String);
    method public android.os.PersistableBundle getPersistableBundle(java.lang.String);
    method public java.io.Serializable getSerializable(java.lang.String);
    method public short getShort(java.lang.String);
    method public short getShort(java.lang.String, short);
    method public short[] getShortArray(java.lang.String);
    method public android.util.SparseArray<T> getSparseParcelableArray(java.lang.String);
    method public java.lang.String getString(java.lang.String);
    method public java.lang.String getString(java.lang.String, java.lang.String);
    method public java.lang.String[] getStringArray(java.lang.String);
    method public java.util.ArrayList<java.lang.String> getStringArrayList(java.lang.String);
    method public boolean hasFileDescriptors();
    method public boolean isEmpty();
    method public java.util.Set<java.lang.String> keySet();
    method public void putAll(android.os.Bundle);
    method public void putAll(android.os.PersistableBundle);
    method public void putBinder(java.lang.String, android.os.IBinder);
    method public void putBoolean(java.lang.String, boolean);
    method public void putBooleanArray(java.lang.String, boolean[]);
@@ -20704,30 +20716,19 @@ package android.os {
    method public void putCharSequence(java.lang.String, java.lang.CharSequence);
    method public void putCharSequenceArray(java.lang.String, java.lang.CharSequence[]);
    method public void putCharSequenceArrayList(java.lang.String, java.util.ArrayList<java.lang.CharSequence>);
    method public void putDouble(java.lang.String, double);
    method public void putDoubleArray(java.lang.String, double[]);
    method public void putFloat(java.lang.String, float);
    method public void putFloatArray(java.lang.String, float[]);
    method public void putInt(java.lang.String, int);
    method public void putIntArray(java.lang.String, int[]);
    method public void putIntegerArrayList(java.lang.String, java.util.ArrayList<java.lang.Integer>);
    method public void putLong(java.lang.String, long);
    method public void putLongArray(java.lang.String, long[]);
    method public void putParcelable(java.lang.String, android.os.Parcelable);
    method public void putParcelableArray(java.lang.String, android.os.Parcelable[]);
    method public void putParcelableArrayList(java.lang.String, java.util.ArrayList<? extends android.os.Parcelable>);
    method public void putPersistableBundle(java.lang.String, android.os.PersistableBundle);
    method public void putSerializable(java.lang.String, java.io.Serializable);
    method public void putShort(java.lang.String, short);
    method public void putShortArray(java.lang.String, short[]);
    method public void putSparseParcelableArray(java.lang.String, android.util.SparseArray<? extends android.os.Parcelable>);
    method public void putString(java.lang.String, java.lang.String);
    method public void putStringArray(java.lang.String, java.lang.String[]);
    method public void putStringArrayList(java.lang.String, java.util.ArrayList<java.lang.String>);
    method public void readFromParcel(android.os.Parcel);
    method public void remove(java.lang.String);
    method public void setClassLoader(java.lang.ClassLoader);
    method public int size();
    method public void writeToParcel(android.os.Parcel, int);
    field public static final android.os.Parcelable.Creator CREATOR;
    field public static final android.os.Bundle EMPTY;
@@ -20745,9 +20746,6 @@ package android.os {
    method public abstract void onCancel();
  }
   abstract class CommonBundle implements java.lang.Cloneable android.os.Parcelable {
  }
  public class ConditionVariable {
    ctor public ConditionVariable();
    ctor public ConditionVariable(boolean);
@@ -21327,46 +21325,14 @@ package android.os {
    field public static final int PATTERN_SIMPLE_GLOB = 2; // 0x2
  }
  public final class PersistableBundle extends android.os.CommonBundle {
  public final class PersistableBundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
    ctor public PersistableBundle();
    ctor public PersistableBundle(java.lang.ClassLoader);
    ctor public PersistableBundle(int);
    ctor public PersistableBundle(android.os.PersistableBundle);
    method public void clear();
    method public java.lang.Object clone();
    method public boolean containsKey(java.lang.String);
    method public int describeContents();
    method public java.lang.Object get(java.lang.String);
    method public java.lang.ClassLoader getClassLoader();
    method public double getDouble(java.lang.String);
    method public double getDouble(java.lang.String, double);
    method public double[] getDoubleArray(java.lang.String);
    method public int getInt(java.lang.String);
    method public int getInt(java.lang.String, int);
    method public int[] getIntArray(java.lang.String);
    method public long getLong(java.lang.String);
    method public long getLong(java.lang.String, long);
    method public long[] getLongArray(java.lang.String);
    method public android.os.PersistableBundle getPersistableBundle(java.lang.String);
    method public java.lang.String getString(java.lang.String);
    method public java.lang.String getString(java.lang.String, java.lang.String);
    method public java.lang.String[] getStringArray(java.lang.String);
    method public boolean isEmpty();
    method public java.util.Set<java.lang.String> keySet();
    method public void putAll(android.os.PersistableBundle);
    method public void putDouble(java.lang.String, double);
    method public void putDoubleArray(java.lang.String, double[]);
    method public void putInt(java.lang.String, int);
    method public void putIntArray(java.lang.String, int[]);
    method public void putLong(java.lang.String, long);
    method public void putLongArray(java.lang.String, long[]);
    method public void putPersistableBundle(java.lang.String, android.os.PersistableBundle);
    method public void putString(java.lang.String, java.lang.String);
    method public void putStringArray(java.lang.String, java.lang.String[]);
    method public void readFromParcel(android.os.Parcel);
    method public void remove(java.lang.String);
    method public void setClassLoader(java.lang.ClassLoader);
    method public int size();
    method public void writeToParcel(android.os.Parcel, int);
    field public static final android.os.Parcelable.Creator CREATOR;
    field public static final android.os.PersistableBundle EMPTY;
+40 −74
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import java.util.Set;
/**
 * A mapping from String values to various types.
 */
abstract class CommonBundle implements Parcelable, Cloneable {
public class BaseBundle {
    private static final String TAG = "Bundle";
    static final boolean DEBUG = false;

@@ -63,7 +63,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * inside of the Bundle.
     * @param capacity Initial size of the ArrayMap.
     */
    CommonBundle(ClassLoader loader, int capacity) {
    BaseBundle(ClassLoader loader, int capacity) {
        mMap = capacity > 0 ?
                new ArrayMap<String, Object>(capacity) : new ArrayMap<String, Object>();
        mClassLoader = loader == null ? getClass().getClassLoader() : loader;
@@ -72,7 +72,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
    /**
     * Constructs a new, empty Bundle.
     */
    CommonBundle() {
    BaseBundle() {
        this((ClassLoader) null, 0);
    }

@@ -82,11 +82,11 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     *
     * @param parcelledData a Parcel containing a Bundle
     */
    CommonBundle(Parcel parcelledData) {
    BaseBundle(Parcel parcelledData) {
        readFromParcelInner(parcelledData);
    }

    CommonBundle(Parcel parcelledData, int length) {
    BaseBundle(Parcel parcelledData, int length) {
        readFromParcelInner(parcelledData, length);
    }

@@ -97,7 +97,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param loader An explicit ClassLoader to use when instantiating objects
     * inside of the Bundle.
     */
    CommonBundle(ClassLoader loader) {
    BaseBundle(ClassLoader loader) {
        this(loader, 0);
    }

@@ -107,7 +107,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     *
     * @param capacity the initial capacity of the Bundle
     */
    CommonBundle(int capacity) {
    BaseBundle(int capacity) {
        this((ClassLoader) null, capacity);
    }

@@ -117,7 +117,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     *
     * @param b a Bundle to be copied.
     */
    CommonBundle(CommonBundle b) {
    BaseBundle(BaseBundle b) {
        if (b.mParcelledData != null) {
            if (b.mParcelledData == EMPTY_PARCEL) {
                mParcelledData = EMPTY_PARCEL;
@@ -148,7 +148,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     *
     * @hide
     */
    String getPairValue() {
    public String getPairValue() {
        unparcel();
        int size = mMap.size();
        if (size > 1) {
@@ -228,7 +228,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
    /**
     * @hide
     */
    boolean isParcelled() {
    public boolean isParcelled() {
        return mParcelledData != null;
    }

@@ -237,7 +237,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     *
     * @return the number of mappings as an int.
     */
    int size() {
    public int size() {
        unparcel();
        return mMap.size();
    }
@@ -245,7 +245,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
    /**
     * Returns true if the mapping of this Bundle is empty, false otherwise.
     */
    boolean isEmpty() {
    public boolean isEmpty() {
        unparcel();
        return mMap.isEmpty();
    }
@@ -253,7 +253,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
    /**
     * Removes all elements from the mapping of this Bundle.
     */
    void clear() {
    public void clear() {
        unparcel();
        mMap.clear();
    }
@@ -265,7 +265,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String key
     * @return true if the key is part of the mapping, false otherwise
     */
    boolean containsKey(String key) {
    public boolean containsKey(String key) {
        unparcel();
        return mMap.containsKey(key);
    }
@@ -276,7 +276,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String key
     * @return an Object, or null
     */
    Object get(String key) {
    public Object get(String key) {
        unparcel();
        return mMap.get(key);
    }
@@ -286,24 +286,24 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     *
     * @param key a String key
     */
    void remove(String key) {
    public void remove(String key) {
        unparcel();
        mMap.remove(key);
    }

    /**
     * Inserts all mappings from the given PersistableBundle into this CommonBundle.
     * Inserts all mappings from the given PersistableBundle into this BaseBundle.
     *
     * @param bundle a PersistableBundle
     */
    void putAll(PersistableBundle bundle) {
    public void putAll(PersistableBundle bundle) {
        unparcel();
        bundle.unparcel();
        mMap.putAll(bundle.mMap);
    }

    /**
     * Inserts all mappings from the given Map into this CommonBundle.
     * Inserts all mappings from the given Map into this BaseBundle.
     *
     * @param map a Map
     */
@@ -317,7 +317,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     *
     * @return a Set of String keys
     */
    Set<String> keySet() {
    public Set<String> keySet() {
        unparcel();
        return mMap.keySet();
    }
@@ -377,7 +377,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String, or null
     * @param value an int, or null
     */
    void putInt(String key, int value) {
    public void putInt(String key, int value) {
        unparcel();
        mMap.put(key, value);
    }
@@ -389,7 +389,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String, or null
     * @param value a long
     */
    void putLong(String key, long value) {
    public void putLong(String key, long value) {
        unparcel();
        mMap.put(key, value);
    }
@@ -413,7 +413,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String, or null
     * @param value a double
     */
    void putDouble(String key, double value) {
    public void putDouble(String key, double value) {
        unparcel();
        mMap.put(key, value);
    }
@@ -425,7 +425,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String, or null
     * @param value a String, or null
     */
    void putString(String key, String value) {
    public void putString(String key, String value) {
        unparcel();
        mMap.put(key, value);
    }
@@ -545,7 +545,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String, or null
     * @param value an int array object, or null
     */
    void putIntArray(String key, int[] value) {
    public void putIntArray(String key, int[] value) {
        unparcel();
        mMap.put(key, value);
    }
@@ -557,7 +557,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String, or null
     * @param value a long array object, or null
     */
    void putLongArray(String key, long[] value) {
    public void putLongArray(String key, long[] value) {
        unparcel();
        mMap.put(key, value);
    }
@@ -581,7 +581,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String, or null
     * @param value a double array object, or null
     */
    void putDoubleArray(String key, double[] value) {
    public void putDoubleArray(String key, double[] value) {
        unparcel();
        mMap.put(key, value);
    }
@@ -593,7 +593,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String, or null
     * @param value a String array object, or null
     */
    void putStringArray(String key, String[] value) {
    public void putStringArray(String key, String[] value) {
        unparcel();
        mMap.put(key, value);
    }
@@ -610,18 +610,6 @@ abstract class CommonBundle implements Parcelable, Cloneable {
        mMap.put(key, value);
    }

    /**
     * Inserts a PersistableBundle value into the mapping of this Bundle, replacing
     * any existing value for the given key.  Either key or value may be null.
     *
     * @param key a String, or null
     * @param value a Bundle object, or null
     */
    void putPersistableBundle(String key, PersistableBundle value) {
        unparcel();
        mMap.put(key, value);
    }

    /**
     * Returns the value associated with the given key, or false if
     * no mapping of the desired type exists for the given key.
@@ -789,7 +777,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String
     * @return an int value
     */
    int getInt(String key) {
    public int getInt(String key) {
        unparcel();
        return getInt(key, 0);
    }
@@ -802,7 +790,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param defaultValue Value to return if key does not exist
     * @return an int value
     */
    int getInt(String key, int defaultValue) {
   public int getInt(String key, int defaultValue) {
        unparcel();
        Object o = mMap.get(key);
        if (o == null) {
@@ -823,7 +811,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String
     * @return a long value
     */
    long getLong(String key) {
    public long getLong(String key) {
        unparcel();
        return getLong(key, 0L);
    }
@@ -836,7 +824,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param defaultValue Value to return if key does not exist
     * @return a long value
     */
    long getLong(String key, long defaultValue) {
    public long getLong(String key, long defaultValue) {
        unparcel();
        Object o = mMap.get(key);
        if (o == null) {
@@ -891,7 +879,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String
     * @return a double value
     */
    double getDouble(String key) {
    public double getDouble(String key) {
        unparcel();
        return getDouble(key, 0.0);
    }
@@ -904,7 +892,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param defaultValue Value to return if key does not exist
     * @return a double value
     */
    double getDouble(String key, double defaultValue) {
    public double getDouble(String key, double defaultValue) {
        unparcel();
        Object o = mMap.get(key);
        if (o == null) {
@@ -926,7 +914,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String, or null
     * @return a String value, or null
     */
    String getString(String key) {
    public String getString(String key) {
        unparcel();
        final Object o = mMap.get(key);
        try {
@@ -946,7 +934,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @return the String value associated with the given key, or defaultValue
     *     if no valid String object is currently mapped to that key.
     */
    String getString(String key, String defaultValue) {
    public String getString(String key, String defaultValue) {
        final String s = getString(key);
        return (s == null) ? defaultValue : s;
    }
@@ -984,28 +972,6 @@ abstract class CommonBundle implements Parcelable, Cloneable {
        return (cs == null) ? defaultValue : cs;
    }

    /**
     * Returns the value associated with the given key, or null if
     * no mapping of the desired type exists for the given key or a null
     * value is explicitly associated with the key.
     *
     * @param key a String, or null
     * @return a Bundle value, or null
     */
    PersistableBundle getPersistableBundle(String key) {
        unparcel();
        Object o = mMap.get(key);
        if (o == null) {
            return null;
        }
        try {
            return (PersistableBundle) o;
        } catch (ClassCastException e) {
            typeWarning(key, o, "Bundle", e);
            return null;
        }
    }

    /**
     * Returns the value associated with the given key, or null if
     * no mapping of the desired type exists for the given key or a null
@@ -1190,7 +1156,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String, or null
     * @return an int[] value, or null
     */
    int[] getIntArray(String key) {
    public int[] getIntArray(String key) {
        unparcel();
        Object o = mMap.get(key);
        if (o == null) {
@@ -1212,7 +1178,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String, or null
     * @return a long[] value, or null
     */
    long[] getLongArray(String key) {
    public long[] getLongArray(String key) {
        unparcel();
        Object o = mMap.get(key);
        if (o == null) {
@@ -1256,7 +1222,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String, or null
     * @return a double[] value, or null
     */
    double[] getDoubleArray(String key) {
    public double[] getDoubleArray(String key) {
        unparcel();
        Object o = mMap.get(key);
        if (o == null) {
@@ -1278,7 +1244,7 @@ abstract class CommonBundle implements Parcelable, Cloneable {
     * @param key a String, or null
     * @return a String[] value, or null
     */
    String[] getStringArray(String key) {
    public String[] getStringArray(String key) {
        unparcel();
        Object o = mMap.get(key);
        if (o == null) {
+2 −361

File changed.

Preview size limit exceeded, changes collapsed.

+42 −428

File changed.

Preview size limit exceeded, changes collapsed.