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

Commit 2a465870 authored by Thomas Girardier's avatar Thomas Girardier Committed by Automerger Merge Worker
Browse files

Merge "Early flag removal for ble_scan_setting" into main am: 01d4b4af am: b7ee3efb 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3393124



Change-Id: Iab49f7380e76b0a8ce862127ec28f9925cc99a73
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f5722131 b7ee3efb

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