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

Commit 010f679a authored by Sonny Sasaka's avatar Sonny Sasaka
Browse files

Floss: Notify OnScannerRegistered when RegisterScanner fails 

Client needs to know if RegisterScanner fails, so we should still call
OnScannerRegisteredCallback when it fails.

Bug: 217273154
Tag: #floss
Test: Build Floss on Linux

Change-Id: I9c9cf4189aee970594d53eb0117be6b05a3511f3
parent c89ec924

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

+5 −6
Original line number Diff line number Diff line
@@ -2454,12 +2454,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);
@@ -2477,6 +2471,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(