Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 329a11f7 authored by Martin Brabham's avatar Martin Brabham Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bluetooth_oob_api" am: 2e677987 am: 8411b5d7 am: 50e294ad 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315

Change-Id: I00dc7f393edb9b562c97147d053302159c12fcdb
parents d50c8e07 50e294ad

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1957,7 +1957,7 @@ package android.bluetooth { 














  public static interface BluetoothAdapter.OobDataCallback {















    method public void onError(int);













    method public void onOobData(int, @Nullable android.bluetooth.OobData);













    method public void onOobData(int, @NonNull android.bluetooth.OobData);















  }





























  public final class BluetoothDevice implements android.os.Parcelable {

























core/java/android/bluetooth/BluetoothAdapter.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -3276,7 +3276,7 @@ public final class BluetoothAdapter {













         * @param transport - whether the {@link OobData} is generated for LE or Classic.















         * @param oobData - data generated in the host stack(LE) or controller (Classic)















         */













        void onOobData(@Transport int transport, @Nullable OobData oobData);













        void onOobData(@Transport int transport, @NonNull OobData oobData);































        /**















         * Provides feedback when things don't go as expected.










@@ -3317,7 +3317,7 @@ public final class BluetoothAdapter {













         *















         * @hide















         */













        public void onOobData(@Transport int transport, OobData oobData) {













        public void onOobData(@Transport int transport, @NonNull OobData oobData) {















            mExecutor.execute(new Runnable() {















                public void run() {















                    mCallback.onOobData(transport, oobData);