diff options
| author | Jakub Pawłowski <jpawlowski@google.com> | 2022-04-12 18:08:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-12 18:08:35 +0000 |
| commit | 1bda1be1f98e9d27e9cb85bfad75a37d929b8db2 (patch) | |
| tree | ed5e585aa10a54d57131c93255689a74e7de5f11 | |
| parent | 2d5d1d55fd2a3410fc9bf7e276dd48d2d3f2ad51 (diff) | |
| parent | fdb7f312acf6b898b3fa5fffaf1b2530ca4f4b60 (diff) | |
Merge "HAL: Bypass binder check when refetching" am: 86ea052996 am: a7487b11f8 am: fdb7f312ac
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2041383
Change-Id: I4c7f602c91979f28b6f33a96149ef3d215bad96c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | system/audio_hal_interface/aidl/client_interface_aidl.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/system/audio_hal_interface/aidl/client_interface_aidl.cc b/system/audio_hal_interface/aidl/client_interface_aidl.cc index 94effee142..f107672b01 100644 --- a/system/audio_hal_interface/aidl/client_interface_aidl.cc +++ b/system/audio_hal_interface/aidl/client_interface_aidl.cc @@ -91,9 +91,11 @@ BluetoothAudioClientInterface::GetAudioCapabilities(SessionType session_type) { void BluetoothAudioClientInterface::FetchAudioProvider() { if (provider_ != nullptr) { - LOG(WARNING) << __func__ << ": reflash"; - } - if (!is_aidl_available()) { + LOG(WARNING) << __func__ << ": refetch"; + } else if (!is_aidl_available()) { + // AIDL availability should only be checked at the beginning. + // When refetching, AIDL may not be ready *yet* but it's expected to be + // available later. return; } auto provider_factory = IBluetoothAudioProviderFactory::fromBinder( |