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

Commit 55ef6a0f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Floss: Notify OnScannerRegistered when RegisterScanner fails" into main am: f4b55ab8 

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



Change-Id: If7b9ead0d1b861240de30bdf4d3998e4a2adc1da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4be1d7f4 f4b55ab8

system/gd/rust/linux/stack/src/bluetooth_gatt.rs

+5 −6
Original line number Diff line number Diff line
@@ -4095,12 +4095,6 @@ impl BtifGattScannerCallbacks for BluetoothGatt { 
            status

        );



        if status != GattStatus::Success {

            log::error!("Error registering scanner UUID {}", uuid);

            self.scanners.lock().unwrap().remove(&uuid);

            return;

        }



        let mut scanners_lock = self.scanners.lock().unwrap();

        let scanner_info = scanners_lock.get_mut(&uuid);
@@ -4117,6 +4111,11 @@ impl BtifGattScannerCallbacks for BluetoothGatt { 
                uuid

            );

        }



        if status != GattStatus::Success {

            log::error!("Error registering scanner UUID {}", uuid);

            scanners_lock.remove(&uuid);

        }

    }



    fn on_scan_result(