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

Commit 05b88203 authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Gerrit Code Review
Browse files

Merge changes from topic "le-gatt-conn-with-type" 

* changes:
  Add support to connect LE Gatt with address type (2/2)
  Add support to connect LE Gatt with address type (1/2)
parents 8a7425dd cae44b5d

android/app/jni/com_android_bluetooth_gatt.cpp

+6 −5
Original line number Diff line number Diff line
@@ -1471,13 +1471,14 @@ static void gattClientScanNative(JNIEnv* env, jobject object, jboolean start) { 
}



static void gattClientConnectNative(JNIEnv* env, jobject object, jint clientif,

                                    jstring address, jboolean isDirect,

                                    jint transport, jboolean opportunistic,

                                    jstring address, jint addressType,

                                    jboolean isDirect, jint transport,

                                    jboolean opportunistic,

                                    jint initiating_phys) {

  if (!sGattIf) return;



  sGattIf->client->connect(clientif, str2addr(env, address), isDirect,

                           transport, opportunistic, initiating_phys);

  sGattIf->client->connect(clientif, str2addr(env, address), addressType,

                           isDirect, transport, opportunistic, initiating_phys);

}



static void gattClientDisconnectNative(JNIEnv* env, jobject object,
@@ -2758,7 +2759,7 @@ static JNINativeMethod sMethods[] = { 
     (void*)gattClientRegisterAppNative},

    {"gattClientUnregisterAppNative", "(I)V",

     (void*)gattClientUnregisterAppNative},

    {"gattClientConnectNative", "(ILjava/lang/String;ZIZI)V",

    {"gattClientConnectNative", "(ILjava/lang/String;IZIZI)V",

     (void*)gattClientConnectNative},

    {"gattClientDisconnectNative", "(ILjava/lang/String;I)V",

     (void*)gattClientDisconnectNative},

android/app/src/com/android/bluetooth/gatt/GattNativeInterface.java

+6 −6
Original line number Diff line number Diff line
@@ -312,8 +312,8 @@ public class GattNativeInterface { 
    private native void gattClientRegisterAppNative(long appUuidLsb, long appUuidMsb,

            boolean eattSupport);

    private native void gattClientUnregisterAppNative(int clientIf);

    private native void gattClientConnectNative(int clientIf, String address, boolean isDirect,

            int transport, boolean opportunistic, int initiatingPhys);

    private native void gattClientConnectNative(int clientIf, String address, int addressType,

            boolean isDirect, int transport, boolean opportunistic, int initiatingPhys);

    private native void gattClientDisconnectNative(int clientIf, String address, int connId);

    private native void gattClientSetPreferredPhyNative(int clientIf, String address, int txPhy,

            int rxPhy, int phyOptions);
@@ -408,10 +408,10 @@ public class GattNativeInterface { 
     * Connect to the remote Gatt server

     * @see {@link BluetoothDevice#connectGatt} for parameters.

     */

    public void gattClientConnect(int clientIf, String address, boolean isDirect, int transport,

            boolean opportunistic, int initiatingPhys) {

        gattClientConnectNative(clientIf, address, isDirect, transport, opportunistic,

                initiatingPhys);

    public void gattClientConnect(int clientIf, String address, int addressType,

            boolean isDirect, int transport, boolean opportunistic, int initiatingPhys) {

        gattClientConnectNative(clientIf, address, addressType, isDirect, transport,

                opportunistic, initiatingPhys);

    }



    /**

android/app/src/com/android/bluetooth/gatt/GattService.java

+16 −14
Original line number Diff line number Diff line
@@ -800,25 +800,26 @@ public class GattService extends ProfileService { 
        }



        @Override

        public void clientConnect(int clientIf, String address, boolean isDirect, int transport,

                boolean opportunistic, int phy, AttributionSource attributionSource,

        public void clientConnect(int clientIf, String address, int addressType, boolean isDirect,

                int transport, boolean opportunistic, int phy, AttributionSource attributionSource,

                SynchronousResultReceiver receiver) {

            try {

                clientConnect(clientIf, address, isDirect, transport, opportunistic, phy,

                        attributionSource);

                clientConnect(clientIf, address, addressType, isDirect, transport, opportunistic,

                        phy, attributionSource);

                receiver.send(null);

            } catch (RuntimeException e) {

                receiver.propagateException(e);

            }

        }

        private void clientConnect(int clientIf, String address, boolean isDirect, int transport,

                boolean opportunistic, int phy, AttributionSource attributionSource) {

        private void clientConnect(int clientIf, String address, int addressType, boolean isDirect,

                int transport, boolean opportunistic, int phy,

                AttributionSource attributionSource) {

            GattService service = getService();

            if (service == null) {

                return;

            }

            service.clientConnect(clientIf, address, isDirect, transport, opportunistic, phy,

                    attributionSource);

            service.clientConnect(clientIf, address, addressType, isDirect, transport,

                    opportunistic, phy, attributionSource);

        }



        @Override
@@ -3627,23 +3628,24 @@ public class GattService extends ProfileService { 
    }



    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    void clientConnect(int clientIf, String address, boolean isDirect, int transport,

            boolean opportunistic, int phy, AttributionSource attributionSource) {

    void clientConnect(int clientIf, String address, int addressType, boolean isDirect,

            int transport, boolean opportunistic, int phy, AttributionSource attributionSource) {

        if (!Utils.checkConnectPermissionForDataDelivery(

                this, attributionSource, "GattService clientConnect")) {

            return;

        }



        if (DBG) {

            Log.d(TAG, "clientConnect() - address=" + address + ", isDirect=" + isDirect

                    + ", opportunistic=" + opportunistic + ", phy=" + phy);

            Log.d(TAG, "clientConnect() - address=" + address + ", addressType="

                    + addressType + ", isDirect=" + isDirect + ", opportunistic="

                    + opportunistic + ", phy=" + phy);

        }

        statsLogAppPackage(address, attributionSource.getUid(), clientIf);

        statsLogGattConnectionStateChange(

                BluetoothProfile.GATT, address, clientIf,

                BluetoothProtoEnums.CONNECTION_STATE_CONNECTING, -1);

        mNativeInterface.gattClientConnect(clientIf, address, isDirect, transport, opportunistic,

                phy);

        mNativeInterface.gattClientConnect(clientIf, address, addressType, isDirect, transport,

                opportunistic, phy);

    }



    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

android/app/tests/unit/src/com/android/bluetooth/gatt/GattServiceBinderTest.java

+5 −4
Original line number Diff line number Diff line
@@ -193,16 +193,17 @@ public class GattServiceBinderTest { 
    public void clientConnect() throws Exception {

        int clientIf = 1;

        String address = REMOTE_DEVICE_ADDRESS;

        int addressType = BluetoothDevice.ADDRESS_TYPE_RANDOM;

        boolean isDirect = true;

        int transport = 2;

        boolean opportunistic = true;

        int phy = 3;



        mBinder.clientConnect(clientIf, address, isDirect, transport, opportunistic, phy,

                mAttributionSource, SynchronousResultReceiver.get());

        mBinder.clientConnect(clientIf, address, addressType, isDirect, transport, opportunistic,

                phy, mAttributionSource, SynchronousResultReceiver.get());



        verify(mService).clientConnect(clientIf, address, isDirect, transport, opportunistic, phy,

                mAttributionSource);

        verify(mService).clientConnect(clientIf, address, addressType, isDirect, transport,

                opportunistic, phy, mAttributionSource);

    }



    @Test

android/app/tests/unit/src/com/android/bluetooth/gatt/GattServiceTest.java

+17 −0
Original line number Diff line number Diff line
@@ -308,6 +308,23 @@ public class GattServiceTest { 
        verify(callback).onBatchScanResults(any());

    }



    @Test

    public void clientConnect() throws Exception {

        int clientIf = 1;

        String address = REMOTE_DEVICE_ADDRESS;

        int addressType = BluetoothDevice.ADDRESS_TYPE_RANDOM;

        boolean isDirect = false;

        int transport = 2;

        boolean opportunistic = true;

        int phy = 3;



        mService.clientConnect(clientIf, address, addressType, isDirect, transport,

                opportunistic, phy, mAttributionSource);



        verify(mNativeInterface).gattClientConnect(clientIf, address, addressType,

                isDirect, transport, opportunistic, phy);

    }



    @Test

    public void disconnectAll() {

        Map<Integer, String> connMap = new HashMap<>();