Snap for 12148957 from 6cc7d94174e95870cbf4f4ea489327a5c454e06b to 24Q4-release (2a1eeac0) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/le_scan/ScanManager.java

+14 −12

Original line number	Diff line number	Diff line
		@@ -1085,7 +1085,8 @@ public class ScanManager {
		mNativeInterface.gattSetScanParameters(
		client.scannerId, scanInterval, scanWindow, scanPhyMask);
		mNativeInterface.gattClientScan(true);
		if (!AppScanStats.recordScanRadioStart(
		if (client.stats != null
		&& !AppScanStats.recordScanRadioStart(
		client.scanModeApp,
		client.scannerId,
		client.stats,
		@@ -1130,7 +1131,8 @@ public class ScanManager {
		Log.d(TAG, "start gattClientScanNative from startRegularScan()");
		mNativeInterface.gattClientScan(true);
		if (!Flags.bleScanAdvMetricsRedesign()) {
		if (!AppScanStats.recordScanRadioStart(
		if (client.stats != null
		&& !AppScanStats.recordScanRadioStart(
		client.settings.getScanMode(),
		client.scannerId,
		client.stats,

+6 −2

Original line number	Diff line number	Diff line
		@@ -587,7 +587,9 @@ public class TransitionalScanHelper {
		return;
		}
		client.appDied = true;
		if (client.stats != null) {
		client.stats.isAppDead = true;
		}
		stopScanInternal(client.scannerId);
		}

		@@ -1474,7 +1476,9 @@ public class TransitionalScanHelper {
		handleDeadScanClient(client);
		} else {
		client.appDied = true;
		if (client.stats != null) {
		client.stats.isAppDead = true;
		}
		stopScanInternal(client.scannerId);
		}
		}

+1 −3

Original line number	Diff line number	Diff line
		@@ -1669,7 +1669,6 @@ class BluetoothManagerService {
		"MESSAGE_BLUETOOTH_STATE_CHANGE:"
		+ (" prevState=" + BluetoothAdapter.nameForState(prevState))
		+ (" newState=" + BluetoothAdapter.nameForState(newState)));
		mState.set(newState);
		bluetoothStateChangeHandler(prevState, newState);
		// handle error state transition case from TURNING_ON to OFF
		// unbind and rebind bluetooth service and enable bluetooth
		@@ -1734,7 +1733,6 @@ class BluetoothManagerService {
		// the BT icon correctly
		if (mState.oneOf(STATE_TURNING_ON, STATE_ON)) {
		bluetoothStateChangeHandler(STATE_ON, STATE_TURNING_OFF);
		mState.set(STATE_TURNING_OFF);
		}
		if (mState.oneOf(STATE_TURNING_OFF)) {
		bluetoothStateChangeHandler(STATE_TURNING_OFF, STATE_OFF);
		@@ -1853,7 +1851,6 @@ class BluetoothManagerService {
		}

		mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);
		mState.set(STATE_OFF);
		// enable
		ActiveLogs.add(ENABLE_DISABLE_REASON_USER_SWITCH, true);
		// mEnable flag could have been reset on stopBle. Reenable it.
		@@ -2050,6 +2047,7 @@ class BluetoothManagerService {
		if (prevState == newState) { // No change. Nothing to do.
		return;
		}
		mState.set(newState);

		if (prevState == STATE_ON) {
		autoOnSetupTimer();

+4 −0

Original line number	Diff line number	Diff line
		@@ -867,6 +867,10 @@ static void process_ind_evt(tBTA_HF_CLIENT_IND* ind) {
		static void btif_hf_client_upstreams_evt(uint16_t event, char* p_param) {
		tBTA_HF_CLIENT* p_data = (tBTA_HF_CLIENT*)p_param;

		if (p_data == nullptr) {
		log::error("event={} ({})'s param is null", dump_hf_client_event(event), event);
		return;
		}
		btif_hf_client_cb_t* cb = btif_hf_client_get_cb_by_bda(p_data->bd_addr);
		if (cb == NULL && event == BTA_HF_CLIENT_OPEN_EVT) {
		log::verbose("event BTA_HF_CLIENT_OPEN_EVT allocating block");