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

Commit 188b53e0 authored by Martin Brabham's avatar Martin Brabham Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bluetooth_oob_api" am: 2e67798711 am: cf7843a0 am:... 

Merge changes from topic "bluetooth_oob_api" am: 2e67798711 am: cf7843a0 am: 79578466 am: 308948fd

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

Change-Id: Ibe23950f01cb3c9c0f493c75ca1975ce2633ffed
parents c6cde36e 308948fd

framework/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);