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

Commit 320e2a12 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Added missing equals override in new Transport Data classes" am: e97c024d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1913506

Change-Id: I6fcda04bc055fbe4f416322948f07adce05b48a4
parents b691d9ce e97c024d

core/java/android/bluetooth/le/TransportBlock.java

+25 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.util.Log; 


import java.nio.BufferOverflowException;

import java.nio.ByteBuffer;

import java.util.Arrays;



/**

 * Wrapper for Transport Discovery Data Transport Blocks.
@@ -59,8 +60,12 @@ public final class TransportBlock implements Parcelable { 
        mOrgId = in.readInt();

        mTdsFlags = in.readInt();

        mTransportDataLength = in.readInt();

        if (mTransportDataLength > 0) {

            mTransportData = new byte[mTransportDataLength];

            in.readByteArray(mTransportData);

        } else {

            mTransportData = null;

        }

    }



    @Override
@@ -68,8 +73,10 @@ public final class TransportBlock implements Parcelable { 
        dest.writeInt(mOrgId);

        dest.writeInt(mTdsFlags);

        dest.writeInt(mTransportDataLength);

        if (mTransportData != null) {

            dest.writeByteArray(mTransportData);

        }

    }



    /**

     * @hide
@@ -79,6 +86,21 @@ public final class TransportBlock implements Parcelable { 
        return 0;

    }



    /**

     * @hide

     */

    @Override

    public boolean equals(@Nullable Object obj) {

        if (this == obj) {

            return true;

        }

        if (obj == null || getClass() != obj.getClass()) {

            return false;

        }

        TransportBlock other = (TransportBlock) obj;

        return Arrays.equals(toByteArray(), other.toByteArray());

    }



    public static final @NonNull Creator<TransportBlock> CREATOR = new Creator<TransportBlock>() {

        @Override

        public TransportBlock createFromParcel(Parcel in) {

core/java/android/bluetooth/le/TransportDiscoveryData.java

+16 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import java.nio.BufferOverflowException; 
import java.nio.BufferUnderflowException;

import java.nio.ByteBuffer;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.List;
@@ -96,6 +97,21 @@ public final class TransportDiscoveryData implements Parcelable { 
        return 0;

    }



    /**

     * @hide

     */

    @Override

    public boolean equals(@Nullable Object obj) {

        if (this == obj) {

            return true;

        }

        if (obj == null || getClass() != obj.getClass()) {

            return false;

        }

        TransportDiscoveryData other = (TransportDiscoveryData) obj;

        return Arrays.equals(toByteArray(), other.toByteArray());

    }



    @Override

    public void writeToParcel(@NonNull Parcel dest, int flags) {

        dest.writeInt(mTransportDataType);