diff options
| author | Etienne Ruffieux <eruffieux@google.com> | 2021-12-16 22:52:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-16 22:52:35 +0000 |
| commit | 261203f6651052a57c041ca1dffeef720f27254c (patch) | |
| tree | d3f19dac4d74bec6cff223b7d1e3ac2837ed85f8 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | d01fdab8d1b484034ca9ef54cbd7d1821db9a638 (diff) | |
| parent | 46638c1b1024c937cd27baeee62683ceefe346b5 (diff) | |
Merge "Moved AttributionSource related APIs in AttributionSource" am: 062731bce5 am: a2fae36e21 am: e6179d6fc6 am: 46638c1b10
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1922817
Change-Id: I60fa5ecea7c9b1bffbd8bfaf0ed85cafb80fa5bc
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 4297512157..2d1ecfb5e0 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -797,7 +797,7 @@ public final class BluetoothAdapter { @RequiresNoPermission public static synchronized BluetoothAdapter getDefaultAdapter() { if (sAdapter == null) { - sAdapter = createAdapter(BluetoothManager.resolveAttributionSource(null)); + sAdapter = createAdapter(AttributionSource.myAttributionSource()); } return sAdapter; } |