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

Commit d366b5e2 authored by Rongxuan Liu's avatar Rongxuan Liu
Browse files

Add support to create le bond with address type (1/2) 

Bug: 265341075
Tag: #feature
Test: atest BluetoothInstrumentationTests;atest BondStateMachineTest
Change-Id: I22000ea0b7b9b619f14d0fc08dacb643b2d4f0f3
parent 63fc4611

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1120,7 +1120,7 @@ static jboolean cancelDiscoveryNative(JNIEnv* env, jobject obj) { 
}



static jboolean createBondNative(JNIEnv* env, jobject obj, jbyteArray address,

                                 jint transport) {

                                 jint addrType, jint transport) {

  ALOGV("%s", __func__);



  if (!sBluetoothInterface) return JNI_FALSE;
@@ -1860,7 +1860,7 @@ static JNINativeMethod sMethods[] = { 
    {"setDevicePropertyNative", "([BI[B)Z", (void*)setDevicePropertyNative},

    {"startDiscoveryNative", "()Z", (void*)startDiscoveryNative},

    {"cancelDiscoveryNative", "()Z", (void*)cancelDiscoveryNative},

    {"createBondNative", "([BI)Z", (void*)createBondNative},

    {"createBondNative", "([BII)Z", (void*)createBondNative},

    {"createBondOutOfBandNative",

     "([BILandroid/bluetooth/OobData;Landroid/bluetooth/OobData;)Z",

     (void*)createBondOutOfBandNative},

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+2 −2
Original line number Diff line number Diff line
@@ -6278,8 +6278,8 @@ public class AdapterService extends Service { 
    /*package*/

    native boolean getDevicePropertyNative(byte[] address, int type);



    /*package*/

    public native boolean createBondNative(byte[] address, int transport);

    /** package */

    public native boolean createBondNative(byte[] address, int addressType, int transport);



    /*package*/

    native boolean createBondOutOfBandNative(byte[] address, int transport,

android/app/src/com/android/bluetooth/btservice/BondStateMachine.java

+2 −1
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ final class BondStateMachine extends StateMachine { 
        if (dev.getBondState() == BluetoothDevice.BOND_NONE) {

            infoLog("Bond address is:" + dev);

            byte[] addr = Utils.getBytesFromAddress(dev.getAddress());

            int addrType = dev.getAddressType();

            boolean result;

            // If we have some data

            if (remoteP192Data != null || remoteP256Data != null) {
@@ -360,7 +361,7 @@ final class BondStateMachine extends StateMachine { 
                      BluetoothDevice.BOND_BONDING,

                      BluetoothProtoEnums.BOND_SUB_STATE_LOCAL_START_PAIRING,

                      BluetoothProtoEnums.UNBOND_REASON_UNKNOWN, mAdapterService.getMetricId(dev));

                result = mAdapterService.createBondNative(addr, transport);

                result = mAdapterService.createBondNative(addr, addrType, transport);

            }

            BluetoothStatsLog.write(BluetoothStatsLog.BLUETOOTH_DEVICE_NAME_REPORTED,

                    mAdapterService.getMetricId(dev), dev.getName());

android/app/tests/unit/src/com/android/bluetooth/btservice/BondStateMachineTest.java

+35 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import static android.Manifest.permission.BLUETOOTH_CONNECT; 


import static org.mockito.Mockito.*;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothManager;

import android.content.Context;
@@ -34,6 +35,7 @@ import androidx.test.filters.MediumTest; 
import androidx.test.runner.AndroidJUnit4;



import com.android.bluetooth.TestUtils;

import com.android.bluetooth.Utils;



import org.junit.After;

import org.junit.Assert;
@@ -113,7 +115,8 @@ public class BondStateMachineTest { 
        deviceProperties2.mBondState = BOND_BONDED;



        doReturn(true).when(mAdapterService).removeBondNative(any(byte[].class));

        doReturn(true).when(mAdapterService).createBondNative(any(byte[].class), anyInt());

        doReturn(true).when(mAdapterService).createBondNative(any(byte[].class),

                eq(BluetoothDevice.ADDRESS_TYPE_PUBLIC), anyInt());



        // The removeBond() request for a bonded device should invoke the removeBondNative() call.

        Message removeBondMsg1 = mBondStateMachine.obtainMessage(BondStateMachine.REMOVE_BOND);
@@ -144,8 +147,37 @@ public class BondStateMachineTest { 
        mBondStateMachine.sendMessage(createBondMsg2);

        TestUtils.waitForLooperToFinishScheduledTask(mBondStateMachine.getHandler().getLooper());



        verify(mAdapterService, times(1)).createBondNative(eq(TEST_BT_ADDR_BYTES), anyInt());

        verify(mAdapterService, times(1)).createBondNative(eq(TEST_BT_ADDR_BYTES_2), anyInt());

        verify(mAdapterService, times(1)).createBondNative(eq(TEST_BT_ADDR_BYTES),

                eq(BluetoothDevice.ADDRESS_TYPE_PUBLIC), anyInt());

        verify(mAdapterService, times(1)).createBondNative(eq(TEST_BT_ADDR_BYTES_2),

                eq(BluetoothDevice.ADDRESS_TYPE_PUBLIC), anyInt());

    }



    @Test

    public void testCreateBondWithLeDevice() {

        mRemoteDevices.reset();

        mBondStateMachine.mPendingBondedDevices.clear();



        BluetoothDevice device1 = BluetoothAdapter.getDefaultAdapter().getRemoteLeDevice(

                        Utils.getAddressStringFromByte(TEST_BT_ADDR_BYTES),

                        BluetoothDevice.ADDRESS_TYPE_PUBLIC);

        BluetoothDevice device2 = BluetoothAdapter.getDefaultAdapter().getRemoteLeDevice(

                        Utils.getAddressStringFromByte(TEST_BT_ADDR_BYTES_2),

                        BluetoothDevice.ADDRESS_TYPE_RANDOM);



        // The createBond() request for two devices with different address types.

        Message createBondMsg1 = mBondStateMachine.obtainMessage(BondStateMachine.CREATE_BOND);

        createBondMsg1.obj = device1;

        mBondStateMachine.sendMessage(createBondMsg1);

        Message createBondMsg2 = mBondStateMachine.obtainMessage(BondStateMachine.CREATE_BOND);

        createBondMsg2.obj = device2;

        mBondStateMachine.sendMessage(createBondMsg2);

        TestUtils.waitForLooperToFinishScheduledTask(mBondStateMachine.getHandler().getLooper());



        verify(mAdapterService, times(1)).createBondNative(eq(TEST_BT_ADDR_BYTES),

                eq(BluetoothDevice.ADDRESS_TYPE_PUBLIC), anyInt());

        verify(mAdapterService, times(1)).createBondNative(eq(TEST_BT_ADDR_BYTES_2),

                eq(BluetoothDevice.ADDRESS_TYPE_RANDOM), anyInt());

    }



    @Test