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

1 files changed, 0 insertions, 7 deletions

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();