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

Commit 973f6cc9 authored by Bhakthavatsala Raghavendra's avatar Bhakthavatsala Raghavendra Committed by Bruno Martins
Browse files

Bluetooth: Add constructor for sending address type 

Override the constructor to send addresstype as part
of Scan results.
These addresstype information will be sent only to previleged
applications

CRs-fixed: 2834981

Change-Id: I47acaf1fcc1cfdd35aa9fe2b913f588cfc51cc70
parent 0bcd0991

core/java/android/bluetooth/le/ScanResult.java

+50 −1
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ public final class ScanResult implements Parcelable, Attributable { 
    private int mAdvertisingSid;

    private int mTxPower;

    private int mPeriodicAdvertisingInterval;

    private int mAddressType;



    /**

     * Constructs a new ScanResult.
@@ -117,6 +118,7 @@ public final class ScanResult implements Parcelable, Attributable { 
        mAdvertisingSid = SID_NOT_PRESENT;

        mTxPower = 127;

        mPeriodicAdvertisingInterval = 0;

        mAddressType = -1;

    }



    /**
@@ -146,6 +148,42 @@ public final class ScanResult implements Parcelable, Attributable { 
        mPeriodicAdvertisingInterval = periodicAdvertisingInterval;

        mScanRecord = scanRecord;

        mTimestampNanos = timestampNanos;

        mAddressType = -1;

    }



    /**

     * Constructs a new ScanResult.

     *

     * @param device Remote Bluetooth device found.

     * @param addressType addressType for the Scan result

     * @param eventType Event type.

     * @param primaryPhy Primary advertising phy.

     * @param secondaryPhy Secondary advertising phy.

     * @param advertisingSid Advertising set ID.

     * @param txPower Transmit power.

     * @param rssi Received signal strength.

     * @param periodicAdvertisingInterval Periodic advertising interval.

     * @param scanRecord Scan record including both advertising data and scan response data.

     * @param timestampNanos Timestamp at which the scan result was observed.

     * @param addressType addressType for the Scan result

     *

     *@hide

     */

    public ScanResult(BluetoothDevice device, int addressType, int eventType, int primaryPhy,

            int secondaryPhy,

            int advertisingSid, int txPower, int rssi, int periodicAdvertisingInterval,

            ScanRecord scanRecord, long timestampNanos) {

        mDevice = device;

        mEventType = eventType;

        mPrimaryPhy = primaryPhy;

        mSecondaryPhy = secondaryPhy;

        mAdvertisingSid = advertisingSid;

        mTxPower = txPower;

        mRssi = rssi;

        mPeriodicAdvertisingInterval = periodicAdvertisingInterval;

        mScanRecord = scanRecord;

        mTimestampNanos = timestampNanos;

        mAddressType = addressType;

    }



    private ScanResult(Parcel in) {
@@ -174,6 +212,7 @@ public final class ScanResult implements Parcelable, Attributable { 
        dest.writeInt(mAdvertisingSid);

        dest.writeInt(mTxPower);

        dest.writeInt(mPeriodicAdvertisingInterval);

        dest.writeInt(mAddressType);

    }



    private void readFromParcel(Parcel in) {
@@ -191,6 +230,7 @@ public final class ScanResult implements Parcelable, Attributable { 
        mAdvertisingSid = in.readInt();

        mTxPower = in.readInt();

        mPeriodicAdvertisingInterval = in.readInt();

        mAddressType = in.readInt();

    }



    @Override
@@ -308,6 +348,14 @@ public final class ScanResult implements Parcelable, Attributable { 
        return mPeriodicAdvertisingInterval;

    }



    /**

     *

     *@hide

     */

    public int getAddressType() {

        return mAddressType;

    }



    @Override

    public int hashCode() {

        return Objects.hash(mDevice, mRssi, mScanRecord, mTimestampNanos,
@@ -333,7 +381,8 @@ public final class ScanResult implements Parcelable, Attributable { 
                && mSecondaryPhy == other.mSecondaryPhy

                && mAdvertisingSid == other.mAdvertisingSid

                && mTxPower == other.mTxPower

                && mPeriodicAdvertisingInterval == other.mPeriodicAdvertisingInterval;

                && mPeriodicAdvertisingInterval == other.mPeriodicAdvertisingInterval

                && mAddressType == other.mAddressType;

    }



    @Override