diff options
| author | Etienne Ruffieux <eruffieux@google.com> | 2021-12-16 22:08:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-16 22:08:37 +0000 |
| commit | 46638c1b1024c937cd27baeee62683ceefe346b5 (patch) | |
| tree | b608e844ae286177c88a174bd7e2aa1bed68b9d4 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 83b5bc3aa00399ab34b8f18d9e5e703526fc984b (diff) | |
| parent | e6179d6fc63dc62cf1d1fcf7c662294fb381fbc3 (diff) | |
Merge "Moved AttributionSource related APIs in AttributionSource" am: 062731bce5 am: a2fae36e21 am: e6179d6fc6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1922817
Change-Id: Id6bcfb0cca120540dd251dda22c713539c5c2b8c
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 d683c6378f..70d0ccaeee 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -786,7 +786,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; } |