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

Commit 54c49700 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "GD Scanning: Simplify address types" am: b39bb8a3 am: d783adae am:... 

Merge "GD Scanning: Simplify address types" am: b39bb8a3 am: d783adae am: f8bc1df9 am: 4531aa6f am: 5b2a9ad7

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



Change-Id: Ie3f26b14144cfe63729eedce60a6148d65331652
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86a8b755 5b2a9ad7

system/gd/hci/le_scanning_manager.cc

+10 −0
Original line number Diff line number Diff line
@@ -501,6 +501,16 @@ struct LeScanningManager::impl : public bluetooth::hci::LeAddressManagerCallback 
      return;

    }



    switch (address_type) {

      case (uint8_t)AddressType::PUBLIC_DEVICE_ADDRESS:

      case (uint8_t)AddressType::PUBLIC_IDENTITY_ADDRESS:

        address_type = (uint8_t)AddressType::PUBLIC_DEVICE_ADDRESS;

        break;

      case (uint8_t)AddressType::RANDOM_DEVICE_ADDRESS:

      case (uint8_t)AddressType::RANDOM_IDENTITY_ADDRESS:

        address_type = (uint8_t)AddressType::RANDOM_DEVICE_ADDRESS;

        break;

    }

    scanning_callbacks_->OnScanResult(

        event_type,

        address_type,