Merge "Copy all 16 bytes of the IRK" (c4e9aa36) · Commits · e / os / android_packages_modules_Bluetooth

android/app/jni/com_android_bluetooth_gatt.cpp

+6 −11

Original line number	Diff line number	Diff line
		@@ -1503,7 +1503,7 @@ static void gattClientScanFilterAddNative(JNIEnv* env, jobject object,
		jfieldID dataMaskFid = env->GetFieldID(entryClazz, "data_mask", "[B");

		for (int i = 0; i < numFilters; ++i) {
		ApcfCommand curr;
		ApcfCommand curr{};

		ScopedLocalRef<jobject> current(env,
		env->GetObjectArrayElement(filters, i));
		@@ -1518,12 +1518,6 @@ static void gattClientScanFilterAddNative(JNIEnv* env, jobject object,

		curr.addr_type = env->GetByteField(current.get(), addrTypeFid);

		// Zero out Apcf IRK, maybe set later if one was passed
		int j;
		for (j = 0; j < 16; j++) {
		curr.irk[j] = 0;
		}

		ScopedLocalRef<jbyteArray> irkByteArray(
		env, (jbyteArray)env->GetObjectField(current.get(), irkTypeFid));

		@@ -1535,10 +1529,11 @@ static void gattClientScanFilterAddNative(JNIEnv* env, jobject object,
		jniThrowIOException(env, EINVAL);
		}
		jbyte* irkBytes = env->GetByteArrayElements(irkByteArray.get(), NULL);
		if (irkBytes != NULL) {
		for (int j = 0; j < len; j++) {
		curr.irk[i] = irkBytes[i];
		if (irkBytes == NULL) {
		jniThrowIOException(env, EINVAL);
		}
		for (int j = 0; j < len; j++) {
		curr.irk[j] = irkBytes[j];
		}
		}