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

Commit f6540cb8 authored by Ashwini Oruganti's avatar Ashwini Oruganti Committed by Android (Google) Code Review
Browse files

Merge "Revert "Migrate unsafe parcel APIs in framework-minus-apex""

parents 3224d197 46c1b43c

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, android.os.ParcelUuid.class)).getUuid();

        mUuid = ((ParcelUuid) in.readParcelable(null)).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, android.os.ParcelUuid.class)).getUuid();

        mUuid = ((ParcelUuid) in.readParcelable(null)).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, android.os.ParcelUuid.class)).getUuid();

        mUuid = ((ParcelUuid) in.readParcelable(null)).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, android.os.ParcelUuid.class)).getUuid();

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

        mInstanceId = in.readInt();

        mServiceType = in.readInt();

framework/java/android/bluetooth/BluetoothHeadsetClientCall.java

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,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, android.bluetooth.BluetoothDevice.class),

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

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

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

                            in.readInt() == 1);