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

Commit bb6ea345 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "OOB generateLocalOobData" am: 3a4f3191 

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

Change-Id: I8317187de5b6a2d5d9ae4deb01509dd2e0fd4fef
parents f3fcd261 3a4f3191

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -1502,6 +1502,8 @@ package android.bluetooth { 
  }















  public static interface BluetoothAdapter.OobDataCallback {













    method public void onError(int);













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















  }





























  public final class BluetoothDevice implements android.os.Parcelable {

































core/java/android/bluetooth/BluetoothAdapter.java



+0
−4




























Original line number
Diff line number
Diff line








@@ -3062,8 +3062,6 @@ 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)













         *













         * @hide















         */















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

























@@ -3071,8 +3069,6 @@ public final class BluetoothAdapter {













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















         *















         * @param errorCode - the code descibing the type of error that occurred.













         *













         * @hide















         */















        void onError(@OobError int errorCode);















    }