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

Merge "Changing readParcelable and readSerializable's method signatures." am: d5b3a5c4a9

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

Change-Id: Iaa3eaadd033a9b839cc8f74e0de3f10cd37e428e
This commit is contained in:
Hao Ke
2022-01-21 17:16:36 +00:00
committed by Automerger Merge Worker
parent 05bc30f21c d5b3a5c4a9
commit 6c1f3fbcd2
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -31589,7 +31589,7 @@ package android.os {
method @Deprecated public void readMap(@NonNull java.util.Map, @Nullable ClassLoader);
method public <K, V> void readMap(@NonNull java.util.Map<? super K,? super V>, @Nullable ClassLoader, @NonNull Class<K>, @NonNull Class<V>);
method @Deprecated @Nullable public <T extends android.os.Parcelable> T readParcelable(@Nullable ClassLoader);
method @Nullable public <T> T readParcelable(@Nullable ClassLoader, @NonNull Class<T>);
method @Nullable public <T extends android.os.Parcelable> T readParcelable(@Nullable ClassLoader, @NonNull Class<? super T>);
method @Deprecated @Nullable public android.os.Parcelable[] readParcelableArray(@Nullable ClassLoader);
method @Nullable public <T> T[] readParcelableArray(@Nullable ClassLoader, @NonNull Class<T>);
method @Deprecated @Nullable public android.os.Parcelable.Creator<?> readParcelableCreator(@Nullable ClassLoader);
@@ -31599,7 +31599,7 @@ package android.os {
method @Nullable public android.os.PersistableBundle readPersistableBundle();
method @Nullable public android.os.PersistableBundle readPersistableBundle(@Nullable ClassLoader);
method @Deprecated @Nullable public java.io.Serializable readSerializable();
method @Nullable public <T> T readSerializable(@Nullable ClassLoader, @NonNull Class<T>);
method @Nullable public <T extends java.io.Serializable> T readSerializable(@Nullable ClassLoader, @NonNull Class<? super T>);
method @NonNull public android.util.Size readSize();
method @NonNull public android.util.SizeF readSizeF();
method @Deprecated @Nullable public <T> android.util.SparseArray<T> readSparseArray(@Nullable ClassLoader);

17
core/java/android/os/Parcel.java
View File

@@ -3704,10 +3704,10 @@ public final class Parcel {
final int m = list.size();
int i = 0;
for (; i < m && i < n; i++) {
list.set(i, (T) readParcelableInternal(cl, clazz));
list.set(i, readParcelableInternal(cl, clazz));
}
for (; i < n; i++) {
list.add((T) readParcelableInternal(cl, clazz));
list.add(readParcelableInternal(cl, clazz));
}
for (; i < m; i++) {
list.remove(n);
@@ -4210,7 +4210,8 @@ public final class Parcel {
* trying to instantiate an element.
*/
@Nullable
public <T> T readParcelable(@Nullable ClassLoader loader, @NonNull Class<T> clazz) {
public <T extends Parcelable> T readParcelable(@Nullable ClassLoader loader,
@NonNull Class<? super T> clazz) {
Objects.requireNonNull(clazz);
return readParcelableInternal(loader, clazz);
}
@@ -4220,7 +4221,8 @@ public final class Parcel {
*/
@SuppressWarnings("unchecked")
@Nullable
private <T> T readParcelableInternal(@Nullable ClassLoader loader, @Nullable Class<T> clazz) {
private <T extends Parcelable> T readParcelableInternal(@Nullable ClassLoader loader,
@Nullable Class<? super T> clazz) {
Parcelable.Creator<?> creator = readParcelableCreatorInternal(loader, clazz);
if (creator == null) {
return null;
@@ -4456,7 +4458,8 @@ public final class Parcel {
* deserializing the object.
*/
@Nullable
public <T> T readSerializable(@Nullable ClassLoader loader, @NonNull Class<T> clazz) {
public <T extends Serializable> T readSerializable(@Nullable ClassLoader loader,
@NonNull Class<? super T> clazz) {
Objects.requireNonNull(clazz);
return readSerializableInternal(
loader == null ? getClass().getClassLoader() : loader, clazz);
@@ -4466,8 +4469,8 @@ public final class Parcel {
* @param clazz The type of the serializable expected or {@code null} for performing no checks
*/
@Nullable
private <T> T readSerializableInternal(@Nullable final ClassLoader loader,
@Nullable Class<T> clazz) {
private <T extends Serializable> T readSerializableInternal(@Nullable final ClassLoader loader,
@Nullable Class<? super T> clazz) {
String name = readString();
if (name == null) {
// For some reason we were unable to read the name of the Serializable (either there