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 | 5251dfbc2aaaee9955f6f077214cde23084967f6 (patch) | |
| tree | 0ae7a5d0e16b7ff821d7c2e28bd0f652b317b633 /core/java/android/bluetooth/BluetoothAdapter.java | |
| parent | aec08ff84a481f1ce5a04fb10e4b3fdbd3efcf6b (diff) | |
| parent | 52dfe57f074bd64ccfcc72377dffca61ca1f0e5d (diff) | |
Merge "Moved AttributionSource related APIs in AttributionSource" am: 70d456d06c am: 52ddc063b0 am: e5d5eefb16 am: 52dfe57f07
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1922817
Change-Id: I60fa5ecea7c9b1bffbd8bfaf0ed85cafb80fa5bc
Diffstat (limited to 'core/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 429751215763..2d1ecfb5e052 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/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; } |