diff options
| author | Rongxuan Liu <rongxuan@google.com> | 2024-05-06 05:55:55 +0000 |
|---|---|---|
| committer | Rongxuan Liu <rongxuan@google.com> | 2024-05-06 06:07:34 +0000 |
| commit | e4aaa19f7a0b086cb08d3be895cf523b3dce07f2 (patch) | |
| tree | 5a3daac833a02519491f2bf0449905a22785197c | |
| parent | 8cc1ff3c87446f9aea9810e6d1a211fb882ef85f (diff) | |
| download | base-e4aaa19f7a0b086cb08d3be895cf523b3dce07f2.tar.gz | |
[Audiosharing] Fix address type usage in QR code format if address not present
Bug: 327599769
Test: atest com.android.settingslib.bluetooth.BluetoothLeBroadcastMetadataExtTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6428ed9fb9f9f1873dede7963d86c3913522ab8d)
Merged-In: I57a0ddeef04c879750c9a1dd51452cf196c8c9ed
Change-Id: I57a0ddeef04c879750c9a1dd51452cf196c8c9ed
NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothLeBroadcastMetadataExt.kt, hunk HunkHeader[311,7->311,7]: Hunk cannot be applied
Original patch:
From 6428ed9fb9f9f1873dede7963d86c3913522ab8d Mon Sep 17 00:00:00 2001
From: Rongxuan Liu <rongxuan@google.com>
Date: Wed, 06 Mar 2024 03:14:00 +0000
Subject: [PATCH] [Audiosharing] Fix address type usage in QR code format if address not present
Bug: 327599769
Test: atest com.android.settingslib.bluetooth.BluetoothLeBroadcastMetadataExtTest
Change-Id: I57a0ddeef04c879750c9a1dd51452cf196c8c9ed
---
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothLeBroadcastMetadataExt.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothLeBroadcastMetadataExt.kt b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothLeBroadcastMetadataExt.kt index da1fd55c4ccb..0c7d6f093289 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 @@ object BluetoothLeBroadcastMetadataExt { } builder.apply { - setSourceDevice(device, sourceAddrType) + setSourceDevice(device, addrType) setSourceAdvertisingSid(sourceAdvertiserSid) setBroadcastId(broadcastId) setBroadcastName(broadcastName) |