Snap for 5860386 from fc7acdf2dbcff5fd26a98477a715d2ac52fa9333 to rvc-release (524c4dd4) · Commits · e / os / android_packages_modules_Bluetooth

system/audio_bluetooth_hw/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ cc_library_shared {
		"libcutils",
		"libfmq",
		"libhidlbase",
		"libhidltransport",
		"liblog",
		"libutils",
		],

system/audio_hal_interface/Android.bp

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ cc_library_static {
		"android.hardware.bluetooth.audio@2.0",
		"libfmq",
		"libhidlbase",
		"libhidltransport",
		],
		static_libs: [
		"libosi",
		@@ -46,7 +45,6 @@ cc_test {
		"libcutils",
		"libfmq",
		"libhidlbase",
		"libhidltransport",
		"liblog",
		"libutils",
		],

system/bta/av/bta_av_main.cc

+12 −6

Original line number	Diff line number	Diff line
		@@ -243,9 +243,7 @@ static void bta_av_api_enable(tBTA_AV_DATA* p_data) {
		enable.features = bta_av_cb.features;

		/* Register for SCO change event */
		if (!(bta_av_cb.features & BTA_AV_FEAT_NO_SCO_SSPD)) {
		bta_sys_sco_register(bta_av_sco_chg_cback);
		}

		/* call callback with enable event */
		tBTA_AV bta_av_data;
		@@ -986,16 +984,20 @@ static void bta_av_sco_chg_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
		int i;
		tBTA_AV_API_STOP stop;

		APPL_TRACE_DEBUG("%s: id:%d status:%d", __func__, id, status);
		LOG(INFO) << __func__ << ": status=" << +status << ", num_links=" << +id;
		if (id) {
		bta_av_cb.sco_occupied = true;

		if (bta_av_cb.features & BTA_AV_FEAT_NO_SCO_SSPD) {
		return;
		}

		/* either BTA_SYS_SCO_OPEN or BTA_SYS_SCO_CLOSE with remaining active SCO */
		for (i = 0; i < BTA_AV_NUM_STRS; i++) {
		p_scb = bta_av_cb.p_scb[i];

		if (p_scb && p_scb->co_started && (!p_scb->sco_suspend)) {
		APPL_TRACE_DEBUG("%s: suspending scb:%d", __func__, i);
		VLOG(1) << __func__ << ": suspending scb:" << i;
		/* scb is used and started, not suspended automatically */
		p_scb->sco_suspend = true;
		stop.flush = false;
		@@ -1007,12 +1009,16 @@ static void bta_av_sco_chg_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
		} else {
		bta_av_cb.sco_occupied = false;

		if (bta_av_cb.features & BTA_AV_FEAT_NO_SCO_SSPD) {
		return;
		}

		for (i = 0; i < BTA_AV_NUM_STRS; i++) {
		p_scb = bta_av_cb.p_scb[i];

		if (p_scb && p_scb->sco_suspend) /* scb is used and suspended for SCO */
		{
		APPL_TRACE_DEBUG("%s: starting scb:%d", __func__, i);
		VLOG(1) << __func__ << ": starting scb:" << i;
		bta_av_ssm_execute(p_scb, BTA_AV_AP_START_EVT, NULL);
		}
		}

system/btif/Android.bp

+0 −3

Original line number	Diff line number	Diff line
		@@ -102,8 +102,6 @@ cc_library_static {
		"android.hardware.bluetooth.a2dp@1.0",
		"android.hardware.bluetooth.audio@2.0",
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"libutils",
		"libcrypto",
		"android.hardware.keymaster@4.0",
		@@ -144,7 +142,6 @@ cc_test {
		"android.hardware.bluetooth.audio@2.0",
		"libfmq",
		"libhidlbase",
		"libhidltransport",
		"liblog",
		"libprotobuf-cpp-lite",
		"libcutils",

system/gd/Android.bp

+0 −8

Original line number	Diff line number	Diff line
		@@ -96,9 +96,7 @@ cc_library {
		],
		shared_libs: [
		"android.hardware.bluetooth@1.0",
		"libhwbinder",
		"libhidlbase",
		"libhidltransport",
		"libutils",
		],
		},
		@@ -156,9 +154,7 @@ cc_binary {
		android: {
		shared_libs: [
		"android.hardware.bluetooth@1.0",
		"libhwbinder",
		"libhidlbase",
		"libhidltransport",
		"libutils",
		],
		},
		@@ -202,9 +198,7 @@ cc_binary {
		android: {
		shared_libs: [
		"android.hardware.bluetooth@1.0",
		"libhwbinder",
		"libhidlbase",
		"libhidltransport",
		"libutils",
		],
		},
		@@ -239,9 +233,7 @@ cc_test {
		],
		shared_libs: [
		"android.hardware.bluetooth@1.0",
		"libhwbinder",
		"libhidlbase",
		"libhidltransport",
		"libutils",
		],
		},