Snap for 4396096 from 7cfd3811272b1e75f8cf25a1923f262df5aa4ce4 to pi-release (67b2a542) · Commits · e / os / android_packages_modules_Bluetooth

android/app/jni/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ cc_library_shared {
		],
		cflags: [
		"-Wall",
		"-Werror",
		"-Wextra",
		"-Wno-unused-parameter",
		],

android/app/jni/com_android_bluetooth_avrcp.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include "hardware/bt_rc.h"
		#include "utils/Log.h"

		#include <inttypes.h>
		#include <string.h>

		namespace android {
		@@ -812,7 +813,7 @@ static jboolean registerNotificationRspTrackChangeNative(JNIEnv* env,
		uid = uid + (trk[uid_idx] << (BTRC_UID_SIZE - 1 - uid_idx));
		}

		ALOGV("%s: Sending track change notification: %d -> %llu", __func__, type,
		ALOGV("%s: Sending track change notification: %d -> %" PRIu64, __func__, type,
		uid);

		bt_status_t status = sBluetoothAvrcpInterface->register_notification_rsp(

android/app/jni/com_android_bluetooth_gatt.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -134,7 +134,7 @@ static jmethodID method_onBatchScanStartStopped;
		static jmethodID method_onBatchScanReports;
		static jmethodID method_onBatchScanThresholdCrossed;

		static jmethodID method_CreateonTrackAdvFoundLostObject;
		static jmethodID method_createOnTrackAdvFoundLostObject;
		static jmethodID method_onTrackAdvFoundLost;
		static jmethodID method_onScanParamSetupCompleted;
		static jmethodID method_getSampleGattDbElement;
		@@ -415,7 +415,7 @@ void btgattc_track_adv_event_cb(btgatt_track_adv_info_t* p_adv_track_info) {
		ScopedLocalRef<jobject> trackadv_obj(
		sCallbackEnv.get(),
		sCallbackEnv->CallObjectMethod(
		mCallbacksObj, method_CreateonTrackAdvFoundLostObject,
		mCallbacksObj, method_createOnTrackAdvFoundLostObject,
		p_adv_track_info->client_if, p_adv_track_info->adv_pkt_len,
		jb_adv_pkt.get(), p_adv_track_info->scan_rsp_len, jb_scan_rsp.get(),
		p_adv_track_info->filt_index, p_adv_track_info->advertiser_state,
		@@ -815,8 +815,8 @@ static void classInitNative(JNIEnv* env, jclass clazz) {
		env->GetMethodID(clazz, "onBatchScanReports", "(IIII[B)V");
		method_onBatchScanThresholdCrossed =
		env->GetMethodID(clazz, "onBatchScanThresholdCrossed", "(I)V");
		method_CreateonTrackAdvFoundLostObject =
		env->GetMethodID(clazz, "CreateonTrackAdvFoundLostObject",
		method_createOnTrackAdvFoundLostObject =
		env->GetMethodID(clazz, "createOnTrackAdvFoundLostObject",
		"(II[BI[BIIILjava/lang/String;IIII)Lcom/android/"
		"bluetooth/gatt/AdvtFilterOnFoundOnLostInfo;");
		method_onTrackAdvFoundLost = env->GetMethodID(
		@@ -825,7 +825,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) {
		method_onScanParamSetupCompleted =
		env->GetMethodID(clazz, "onScanParamSetupCompleted", "(II)V");
		method_getSampleGattDbElement =
		env->GetMethodID(clazz, "GetSampleGattDbElement",
		env->GetMethodID(clazz, "getSampleGattDbElement",
		"()Lcom/android/bluetooth/gatt/GattDbElement;");
		method_onGetGattDb =
		env->GetMethodID(clazz, "onGetGattDb", "(ILjava/util/ArrayList;)V");

android/app/jni/com_android_bluetooth_sdp.cpp

+5 −15

Original line number	Diff line number	Diff line
		@@ -27,21 +27,11 @@

		using bluetooth::Uuid;

		static const Uuid UUID_OBEX_OBJECT_PUSH = Uuid::From128BitBE(
		Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x05, 0x00, 0x00, 0x10, 0x00, 0x80,
		0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});
		static const Uuid UUID_PBAP_PSE = Uuid::From128BitBE(
		Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x2F, 0x00, 0x00, 0x10, 0x00, 0x80,
		0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});
		static const Uuid UUID_MAP_MAS = Uuid::From128BitBE(
		Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x32, 0x00, 0x00, 0x10, 0x00, 0x80,
		0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});
		static const Uuid UUID_MAP_MNS = Uuid::From128BitBE(
		Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x33, 0x00, 0x00, 0x10, 0x00, 0x80,
		0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});
		static const Uuid UUID_SAP = Uuid::From128BitBE(
		Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x2D, 0x00, 0x00, 0x10, 0x00, 0x80,
		0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});
		static const Uuid UUID_OBEX_OBJECT_PUSH = Uuid::From16Bit(0x1105);
		static const Uuid UUID_PBAP_PSE = Uuid::From16Bit(0x112F);
		static const Uuid UUID_MAP_MAS = Uuid::From16Bit(0x1132);
		static const Uuid UUID_MAP_MNS = Uuid::From16Bit(0x1133);
		static const Uuid UUID_SAP = Uuid::From16Bit(0x112D);

		namespace android {
		static jmethodID method_sdpRecordFoundCallback;

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -843,8 +843,8 @@ public class A2dpSinkStateMachine extends StateMachine {
		}
		}

		public boolean SendPassThruPlay(BluetoothDevice mDevice) {
		log("SendPassThruPlay + ");
		public boolean sendPassThruPlay(BluetoothDevice mDevice) {
		log("sendPassThruPlay + ");
		AvrcpControllerService avrcpCtrlService = AvrcpControllerService.getAvrcpControllerService();
		if ((avrcpCtrlService != null) && (mDevice != null) &&
		(avrcpCtrlService.getConnectedDevices().contains(mDevice))){
		@@ -854,7 +854,7 @@ public class A2dpSinkStateMachine extends StateMachine {
		avrcpCtrlService.sendPassThroughCmd(mDevice,
		AvrcpControllerService.PASS_THRU_CMD_ID_PLAY,
		AvrcpControllerService.KEY_STATE_RELEASED);
		log(" SendPassThruPlay command sent - ");
		log(" sendPassThruPlay command sent - ");
		return true;
		} else {
		log("passthru command not sent, connection unavailable");