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

Commit 664e2abe authored by William Escande's avatar William Escande
Browse files

Framework: Fix & enforce AndroidFrameworkEfficientParcelable

Bug: 344658662
Test: m framework-bluetooth
Flag: Exempt following errorprone recommendation
Change-Id: I8e8bc355c006536de00f7de304f527769946c82f
parent 6924778d
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ java_sdk_library {
            "-Xep:InlineMeSuggester:OFF", // The @InlineMe annotation is not available

            "-Xep:AndroidFrameworkCompatChange:ERROR",
            "-Xep:AndroidFrameworkEfficientParcelable:ERROR",
            "-Xep:AndroidFrameworkEfficientStrings:ERROR",
            "-Xep:AndroidFrameworkRequiresPermission:ERROR",
            "-Xep:AndroidFrameworkRethrowFromSystem:ERROR",
+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public final class BluetoothCodecType implements Parcelable {
    public void writeToParcel(@NonNull Parcel dest, int flags) {
        dest.writeInt(mNativeCodecType);
        dest.writeLong(mCodecId);
        dest.writeString(mCodecName);
        BluetoothUtils.writeStringToParcel(dest, mCodecName);
    }

    /**
+1 −1
Original line number Diff line number Diff line
@@ -1539,7 +1539,7 @@ public final class BluetoothDevice implements Parcelable, Attributable {

    @Override
    public void writeToParcel(Parcel out, int flags) {
        out.writeString(mAddress);
        BluetoothUtils.writeStringToParcel(out, mAddress);
        out.writeInt(mAddressType);
    }

+6 −12
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ public class BluetoothGattCharacteristic implements Parcelable {
        mPermissions = permissions;
        mService = service;
        mValue = null;
        mDescriptors = new ArrayList<BluetoothGattDescriptor>();
        mDescriptors = new ArrayList<>();

        if ((mProperties & PROPERTY_WRITE_NO_RESPONSE) != 0) {
            mWriteType = WRITE_TYPE_NO_RESPONSE;
@@ -248,7 +248,7 @@ public class BluetoothGattCharacteristic implements Parcelable {

    @Override
    public void writeToParcel(Parcel out, int flags) {
        out.writeParcelable(new ParcelUuid(mUuid), 0);
        (new ParcelUuid(mUuid)).writeToParcel(out, flags);
        out.writeInt(mInstance);
        out.writeInt(mProperties);
        out.writeInt(mPermissions);
@@ -269,22 +269,16 @@ public class BluetoothGattCharacteristic implements Parcelable {
            };

    private BluetoothGattCharacteristic(Parcel in) {
        mUuid = ((ParcelUuid) in.readParcelable(null)).getUuid();
        mUuid = ParcelUuid.CREATOR.createFromParcel(in).getUuid();
        mInstance = in.readInt();
        mProperties = in.readInt();
        mPermissions = in.readInt();
        mKeySize = in.readInt();
        mWriteType = in.readInt();

        mDescriptors = new ArrayList<BluetoothGattDescriptor>();

        ArrayList<BluetoothGattDescriptor> descs =
                in.createTypedArrayList(BluetoothGattDescriptor.CREATOR);
        if (descs != null) {
            for (BluetoothGattDescriptor desc : descs) {
        mDescriptors = in.createTypedArrayList(BluetoothGattDescriptor.CREATOR);
        for (BluetoothGattDescriptor desc : mDescriptors) {
            desc.setCharacteristic(this);
                mDescriptors.add(desc);
            }
        }
    }

+2 −2
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public class BluetoothGattDescriptor implements Parcelable {

    @Override
    public void writeToParcel(Parcel out, int flags) {
        out.writeParcelable(new ParcelUuid(mUuid), 0);
        (new ParcelUuid(mUuid)).writeToParcel(out, flags);
        out.writeInt(mInstance);
        out.writeInt(mPermissions);
    }
@@ -160,7 +160,7 @@ public class BluetoothGattDescriptor implements Parcelable {
            };

    private BluetoothGattDescriptor(Parcel in) {
        mUuid = ((ParcelUuid) in.readParcelable(null)).getUuid();
        mUuid = ParcelUuid.CREATOR.createFromParcel(in).getUuid();
        mInstance = in.readInt();
        mPermissions = in.readInt();
    }
Loading