Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08c867dc authored Dec 04, 2024 by William Escande

Early flag removal for ble_scan_setting

Note that this change is also behind respect_ble_scan_setting

Bug: 380917653
Bug: 379166793
Fix: 379166793
Test: m bluetooth | There are no automatic test for scan_setting
Flag: com.android.bluetooth.flags.ble_scan_setting_does_not_disconnect_if_bt_on
Change-Id: Ic19f534bcf8ad57b7c223bd6dbc699cca762a24d

parent 3b15d68f

flags/system_service.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -61,16 +61,6 @@ flag {
		bug: "341783936"
		}

		flag {
		name: "ble_scan_setting_does_not_disconnect_if_bt_on"
		namespace: "bluetooth"
		description: "Stop calling unregAllGattClient when toggling the ble scan setting and bluetooth is ON"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		bug: "379166793"
		}

		flag {
		name: "system_server_messenger"
		namespace: "bluetooth"

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -684,13 +684,6 @@ class BluetoothManagerService {
		}
		clearBleApps();

		if (!Flags.bleScanSettingDoesNotDisconnectIfBtOn()) {
		try {
		mAdapter.unregAllGattClient(mContext.getAttributionSource());
		} catch (RemoteException e) {
		Log.e(TAG, "onBleScanDisabled: unregAllGattClient failed", e);
		}
		}
		if (mState.oneOf(STATE_BLE_ON)) {
		Log.i(TAG, "onBleScanDisabled: Shutting down BLE_ON mode");
		bleOnToOff();