diff options
| -rw-r--r-- | flags/system_service.aconfig | 10 | ||||
| -rw-r--r-- | service/src/com/android/server/bluetooth/BluetoothManagerService.java | 7 |
2 files changed, 0 insertions, 17 deletions
diff --git a/flags/system_service.aconfig b/flags/system_service.aconfig index 73f30611a6..ab542121b9 100644 --- a/flags/system_service.aconfig +++ b/flags/system_service.aconfig @@ -62,16 +62,6 @@ flag { } 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" description: "Replace binder call to the system server with a Messenger to enforce thread safety" diff --git a/service/src/com/android/server/bluetooth/BluetoothManagerService.java b/service/src/com/android/server/bluetooth/BluetoothManagerService.java index a78d85797d..f9e53ff65e 100644 --- a/service/src/com/android/server/bluetooth/BluetoothManagerService.java +++ b/service/src/com/android/server/bluetooth/BluetoothManagerService.java @@ -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(); |