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

Commit 54298877 authored by Bernardo Rufino's avatar Bernardo Rufino
Browse files

Migrate unsafe parcel APIs in framework-minus-apex 

Migrate the following unsafe parcel APIs in framework-minus-apex:
* Parcel.readSerializable()
* Parcel.readArrayList()
* Parcel.readList()
* Parcel.readParcelable()
* Parcel.readParcelableList()
* Parcel.readSparseArray()

This CL was generated by applying lint fixes that infer the expected
type from the caller code and provide that as the type parameter
(ag/16365240).

A few observations:
* In some classes we couldn't migrate because the class also belonged to
another build module whose min SDK wasn't current (as is the case for
framework-minus-apex), hence I suppressed the lint check
(since I'll eventually submit the lint check to the tree).
* In some cases, I needed to do the cast in
https://stackoverflow.com/a/1080525/5765705 to make the compiler happy
since there isn't another way of providing a class of type
Class<MyClassWithGenerics<T>>.
* In the readSerializable() case, the new API also requires the class
loader, that was inferred to by InferredClass.class.getClassLoader().
* Note that automatic formatting and import rely on running hooked up
to the IDE, which wasn't the case here.

Bug: 195622897
Test: TH passes
Change-Id: I11a27b9bdab7959ee86e90aa1e1cbebd7aaf883c
parent c28a0134

framework/java/android/bluetooth/BluetoothGattCharacteristic.java

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ public class BluetoothGattCharacteristic implements Parcelable { 
    };



    private BluetoothGattCharacteristic(Parcel in) {

        mUuid = ((ParcelUuid) in.readParcelable(null)).getUuid();

        mUuid = ((ParcelUuid) in.readParcelable(null, android.os.ParcelUuid.class)).getUuid();

        mInstance = in.readInt();

        mProperties = in.readInt();

        mPermissions = in.readInt();

framework/java/android/bluetooth/BluetoothGattDescriptor.java

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ public class BluetoothGattDescriptor implements Parcelable { 
    };



    private BluetoothGattDescriptor(Parcel in) {

        mUuid = ((ParcelUuid) in.readParcelable(null)).getUuid();

        mUuid = ((ParcelUuid) in.readParcelable(null, android.os.ParcelUuid.class)).getUuid();

        mInstance = in.readInt();

        mPermissions = in.readInt();

    }

framework/java/android/bluetooth/BluetoothGattIncludedService.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class BluetoothGattIncludedService implements Parcelable { 
    };



    private BluetoothGattIncludedService(Parcel in) {

        mUuid = ((ParcelUuid) in.readParcelable(null)).getUuid();

        mUuid = ((ParcelUuid) in.readParcelable(null, android.os.ParcelUuid.class)).getUuid();

        mInstanceId = in.readInt();

        mServiceType = in.readInt();

    }

framework/java/android/bluetooth/BluetoothGattService.java

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public class BluetoothGattService implements Parcelable { 
    };



    private BluetoothGattService(Parcel in) {

        mUuid = ((ParcelUuid) in.readParcelable(null)).getUuid();

        mUuid = ((ParcelUuid) in.readParcelable(null, android.os.ParcelUuid.class)).getUuid();

        mInstanceId = in.readInt();

        mServiceType = in.readInt();

framework/java/android/bluetooth/BluetoothHeadsetClientCall.java

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable, Attributabl 
            new Parcelable.Creator<BluetoothHeadsetClientCall>() {

                @Override

                public BluetoothHeadsetClientCall createFromParcel(Parcel in) {

                    return new BluetoothHeadsetClientCall((BluetoothDevice) in.readParcelable(null),

                    return new BluetoothHeadsetClientCall((BluetoothDevice) in.readParcelable(null, android.bluetooth.BluetoothDevice.class),

                            in.readInt(), UUID.fromString(in.readString()), in.readInt(),

                            in.readString(), in.readInt() == 1, in.readInt() == 1,

                            in.readInt() == 1);