Merge "GATT: Expose opportunistic client API to Java" am: 6b5f229061 am: 910de1c2af am: ceab52a692 (67e54345) · Commits · e / os / android_packages_apps_Bluetooth

jni/com_android_bluetooth_gatt.cpp

+4 −3

Original line number	Diff line number	Diff line
		@@ -984,11 +984,12 @@ static void gattClientScanNative(JNIEnv* env, jobject object, jboolean start) {

		static void gattClientConnectNative(JNIEnv* env, jobject object, jint clientif,
		jstring address, jboolean isDirect,
		jint transport, jint initiating_phys) {
		jint transport, jboolean opportunistic,
		jint initiating_phys) {
		if (!sGattIf) return;

		sGattIf->client->connect(clientif, str2addr(env, address), isDirect,
		transport, initiating_phys);
		transport, opportunistic, initiating_phys);
		}

		static void gattClientDisconnectNative(JNIEnv* env, jobject object,
		@@ -2137,7 +2138,7 @@ static JNINativeMethod sMethods[] = {
		(void*)gattClientRegisterAppNative},
		{"gattClientUnregisterAppNative", "(I)V",
		(void*)gattClientUnregisterAppNative},
		{"gattClientConnectNative", "(ILjava/lang/String;ZII)V",
		{"gattClientConnectNative", "(ILjava/lang/String;ZIZI)V",
		(void*)gattClientConnectNative},
		{"gattClientDisconnectNative", "(ILjava/lang/String;I)V",
		(void*)gattClientDisconnectNative},

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -417,11 +417,11 @@ public class GattService extends ProfileService {
		}

		@Override
		public void clientConnect(
		int clientIf, String address, boolean isDirect, int transport, int phy) {
		public void clientConnect(int clientIf, String address, boolean isDirect, int transport,
		boolean opportunistic, int phy) {
		GattService service = getService();
		if (service == null) return;
		service.clientConnect(clientIf, address, isDirect, transport, phy);
		service.clientConnect(clientIf, address, isDirect, transport, opportunistic, phy);
		}

		@Override
		@@ -1802,14 +1802,15 @@ public class GattService extends ProfileService {
		gattClientUnregisterAppNative(clientIf);
		}

		void clientConnect(int clientIf, String address, boolean isDirect, int transport, int phy) {
		void clientConnect(int clientIf, String address, boolean isDirect, int transport,
		boolean opportunistic, int phy) {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

		if (DBG) {
		Log.d(TAG, "clientConnect() - address=" + address + ", isDirect=" + isDirect + ", phy= "
		+ phy);
		Log.d(TAG, "clientConnect() - address=" + address + ", isDirect=" + isDirect +
		", opportunistic=" + opportunistic + ", phy=" + phy);
		}
		gattClientConnectNative(clientIf, address, isDirect, transport, phy);
		gattClientConnectNative(clientIf, address, isDirect, transport, opportunistic, phy);
		}

		void clientDisconnect(int clientIf, String address) {
		@@ -2696,8 +2697,8 @@ public class GattService extends ProfileService {

		private native void gattClientUnregisterAppNative(int clientIf);

		private native void gattClientConnectNative(
		int clientIf, String address, boolean isDirect, int transport, int initiating_phys);
		private native void gattClientConnectNative(int clientIf, String address, boolean isDirect,
		int transport, boolean opportunistic, int initiating_phys);

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