| commit | e777fc54b1b22a6709d45fd19c2b69ded7ba2d2f | [log] [tgz] |
|---|---|---|
| author | Rongxuan Liu <rongxuan@google.com> | Mon May 06 07:39:02 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 06 07:39:02 2024 +0000 |
| tree | 5a3daac833a02519491f2bf0449905a22785197c | |
| parent | dbfa0db24b4b501af19c11d88469b8172bd09217 [diff] | |
| parent | e933e38c58304367de017c98bd77cc432ddc0ee2 [diff] |
Merge changes from topic "cherrypicker-L83000030003604164:N29900030057840634" into main am: e933e38c58 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3075386 Change-Id: I07f6c7a65b35b2ea21d253cee422b709bf54c8d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothLeBroadcastMetadataExt.kt b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothLeBroadcastMetadataExt.kt index da1fd55..0c7d6f0 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothLeBroadcastMetadataExt.kt +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothLeBroadcastMetadataExt.kt
@@ -311,7 +311,7 @@ } builder.apply { - setSourceDevice(device, sourceAddrType) + setSourceDevice(device, addrType) setSourceAdvertisingSid(sourceAdvertiserSid) setBroadcastId(broadcastId) setBroadcastName(broadcastName)