Merge "Fix GATT Characteristic write type serialization"

am: 233f48e3fa

* commit '233f48e3fa4321a9a2e2523a67a8e5120def5c33':
  Fix GATT Characteristic write type serialization

Change-Id: Ica00ad9ce313a27e82c5740061347f034c69db0e

core/java/android/bluetooth/BluetoothGattCharacteristic.java

@@ -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>();