Merge "Pass new LE CoC min_ce/max_ce parameters to native stack" (b9002ea3) · Commits · e / os / android_packages_modules_Bluetooth

android/app/jni/com_android_bluetooth_gatt.cpp

+6 −4

Original line number	Diff line number	Diff line
		@@ -1402,10 +1402,12 @@ static void gattConnectionParameterUpdateNative(JNIEnv* env, jobject object,
		jint client_if, jstring address,
		jint min_interval,
		jint max_interval, jint latency,
		jint timeout) {
		jint timeout, jint min_ce_len,
		jint max_ce_len) {
		if (!sGattIf) return;
		sGattIf->client->conn_parameter_update(str2addr(env, address), min_interval,
		max_interval, latency, timeout);
		sGattIf->client->conn_parameter_update(
		str2addr(env, address), min_interval, max_interval, latency, timeout,
		(uint16_t)min_ce_len, (uint16_t)max_ce_len);
		}

		void batchscan_cfg_storage_cb(uint8_t client_if, uint8_t status) {
		@@ -2168,7 +2170,7 @@ static JNINativeMethod sMethods[] = {
		(void*)gattClientReadRemoteRssiNative},
		{"gattClientConfigureMTUNative", "(II)V",
		(void*)gattClientConfigureMTUNative},
		{"gattConnectionParameterUpdateNative", "(ILjava/lang/String;IIII)V",
		{"gattConnectionParameterUpdateNative", "(ILjava/lang/String;IIIIII)V",
		(void*)gattConnectionParameterUpdateNative},
		{"gattServerRegisterAppNative", "(JJ)V",
		(void*)gattServerRegisterAppNative},

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

+17 −9

Original line number	Diff line number	Diff line
		@@ -677,14 +677,16 @@ public class GattService extends ProfileService {
		@Override
		public void leConnectionUpdate(int clientIf, String address,
		int minConnectionInterval, int maxConnectionInterval,
		int slaveLatency, int supervisionTimeout) {
		int slaveLatency, int supervisionTimeout,
		int minConnectionEventLen, int maxConnectionEventLen) {
		GattService service = getService();
		if (service == null) {
		return;
		}
		service.leConnectionUpdate(clientIf, address, minConnectionInterval,
		maxConnectionInterval, slaveLatency,
		supervisionTimeout);
		supervisionTimeout, minConnectionEventLen,
		maxConnectionEventLen);
		}

		@Override
		@@ -2485,21 +2487,26 @@ public class GattService extends ProfileService {
		+ connectionPriority + " interval=" + minInterval + "/" + maxInterval);
		}
		gattConnectionParameterUpdateNative(clientIf, address, minInterval, maxInterval, latency,
		timeout);
		timeout, 0, 0);
		}

		void leConnectionUpdate(int clientIf, String address, int minInterval,
		int maxInterval, int slaveLatency,
		int supervisionTimeout) {
		int supervisionTimeout, int minConnectionEventLen,
		int maxConnectionEventLen) {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

		if (DBG) {
		Log.d(TAG, "leConnectionUpdate() - address=" + address + ", intervals="
		+ minInterval + "/" + maxInterval + ", latency=" + slaveLatency
		+ ", timeout=" + supervisionTimeout);
		+ ", timeout=" + supervisionTimeout + "msec" + ", min_ce="
		+ minConnectionEventLen + ", max_ce=" + maxConnectionEventLen);


		}
		gattConnectionParameterUpdateNative(clientIf, address, minInterval, maxInterval,
		slaveLatency, supervisionTimeout);
		slaveLatency, supervisionTimeout,
		minConnectionEventLen, maxConnectionEventLen);
		}

		/**************************************************************************
		@@ -3238,7 +3245,8 @@ public class GattService extends ProfileService {
		private native void gattClientConfigureMTUNative(int connId, int mtu);

		private native void gattConnectionParameterUpdateNative(int clientIf, String address,
		int minInterval, int maxInterval, int latency, int timeout);
		int minInterval, int maxInterval, int latency, int timeout, int minConnectionEventLen,
		int maxConnectionEventLen);

		private native void gattServerRegisterAppNative(long appUuidLsb, long appUuidMsb);