Snap for 8735997 from ef4c16a76887b1208d76e5932f6f58f93f001c5c to tm-release (5ddceef3) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/btservice/AdapterProperties.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -691,6 +691,10 @@ class AdapterProperties {
		BluetoothDevice device = connIntent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
		int prevState = connIntent.getIntExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, -1);
		int state = connIntent.getIntExtra(BluetoothProfile.EXTRA_STATE, -1);
		if (state == BluetoothProfile.STATE_CONNECTING) {
		BluetoothStatsLog.write(BluetoothStatsLog.BLUETOOTH_DEVICE_NAME_REPORTED,
		mService.getMetricId(device), device.getName());
		}
		Log.d(TAG,
		"PROFILE_CONNECTION_STATE_CHANGE: profile=" + profile + ", device=" + device + ", "
		+ prevState + " -> " + state);

+2 −0

Original line number	Diff line number	Diff line
		@@ -331,6 +331,8 @@ final class BondStateMachine extends StateMachine {
		} else {
		result = mAdapterService.createBondNative(addr, transport);
		}
		BluetoothStatsLog.write(BluetoothStatsLog.BLUETOOTH_DEVICE_NAME_REPORTED,
		mAdapterService.getMetricId(dev), dev.getName());
		BluetoothStatsLog.write(BluetoothStatsLog.BLUETOOTH_BOND_STATE_CHANGED,
		mAdapterService.obfuscateAddress(dev), transport, dev.getType(),
		BluetoothDevice.BOND_BONDING,

+13 −0

Original line number	Diff line number	Diff line
		@@ -3397,6 +3397,7 @@ public class GattService extends ProfileService {
		Log.d(TAG, "clientConnect() - address=" + address + ", isDirect=" + isDirect
		+ ", opportunistic=" + opportunistic + ", phy=" + phy);
		}
		statsLogAppPackage(address, attributionSource.getPackageName());
		statsLogGattConnectionStateChange(
		BluetoothProfile.GATT, address, clientIf,
		BluetoothProtoEnums.CONNECTION_STATE_CONNECTING);
		@@ -3988,6 +3989,7 @@ public class GattService extends ProfileService {
		}

		app.callback.onServerConnectionState((byte) 0, serverIf, connected, address);
		statsLogAppPackage(address, app.name);
		statsLogGattConnectionStateChange(
		BluetoothProfile.GATT_SERVER, address, serverIf, connectionState);
		}
		@@ -4663,6 +4665,17 @@ public class GattService extends ProfileService {
		}
		}

		private void statsLogAppPackage(String address, String app) {
		BluetoothDevice device = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(address);
		BluetoothStatsLog.write(
		BluetoothStatsLog.BLUETOOTH_DEVICE_NAME_REPORTED,
		mAdapterService.getMetricId(device), app);
		if (DBG) {
		Log.d(TAG, "Gatt Logging: metric_id=" + mAdapterService.getMetricId(device)
		+ ", app=" + app);
		}
		}

		private void statsLogGattConnectionStateChange(
		int profile, String address, int sessionIndex, int connectionState) {
		BluetoothDevice device = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(address);

+6 −1

Original line number	Diff line number	Diff line
		@@ -449,7 +449,12 @@ static void bta_dm_pm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
		}

		if (p_bta_dm_ssr_spec[index].max_lat \|\| index == BTA_DM_PM_SSR_HH) {
		/* do not perform ssr for AVDTP start */
		if (id != BTA_ID_AV \|\| status != BTA_SYS_CONN_BUSY) {
		bta_dm_pm_ssr(peer_addr, index);
		} else {
		LOG_DEBUG("Do not perform SSR when AVDTP start");
		}
		} else {
		const controller_t* controller = controller_get_interface();
		uint8_t* p = NULL;

+0 −3

Original line number	Diff line number	Diff line
		@@ -182,9 +182,6 @@ static const interop_addr_entry_t interop_addr_database[] = {
		// KDDI Carkit
		{{{0x44, 0xea, 0xd8, 0, 0, 0}}, 3, INTEROP_DISABLE_SNIFF},

		// Phonak
		{{{0x70, 0x66, 0x1b, 0, 0, 0}}, 3, INTEROP_DISABLE_SNIFF},

		// Toyota Camry 2018 Carkit HFP AT+BIND missing
		{{{0x94, 0xb2, 0xcc, 0x30, 0, 0}}, 4, INTEROP_SLC_SKIP_BIND_COMMAND},
		};