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

Commit 216aa498 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Fix GATT Characteristic write type serialization" into nyc-dev 

am: 9d7d2ec6

* commit '9d7d2ec6':
  Fix GATT Characteristic write type serialization

Change-Id: I34371be231333d4647e3f01d4f66f8c2e756b5e9
parents 3fb70705 9d7d2ec6

core/java/android/bluetooth/BluetoothGattCharacteristic.java

+4 −0
Original line number Diff line number Diff line
@@ -284,6 +284,8 @@ public class BluetoothGattCharacteristic implements Parcelable { 
        out.writeInt(mInstance);

        out.writeInt(mProperties);

        out.writeInt(mPermissions);

        out.writeInt(mKeySize);

        out.writeInt(mWriteType);

        out.writeTypedList(mDescriptors);

    }
@@ -303,6 +305,8 @@ public class BluetoothGattCharacteristic implements Parcelable { 
        mInstance = in.readInt();

        mProperties = in.readInt();

        mPermissions = in.readInt();

        mKeySize = in.readInt();

        mWriteType = in.readInt();



        mDescriptors = new ArrayList<BluetoothGattDescriptor>();