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

Commit 21c0316e authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "Return correct result of Bluetooth HID device app registration" am:... 

Merge "Return correct result of Bluetooth HID device app registration" am: f76c38bd am: 532481f7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2072648



Change-Id: Ifa47315a738a7b8b90d5b9d378eba0211e15a530
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9aa88b45 532481f7

framework/java/android/bluetooth/BluetoothHidDevice.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -580,7 +580,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { 
                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                CallbackWrapper cbw = new CallbackWrapper(executor, callback, mAttributionSource);

                CallbackWrapper cbw = new CallbackWrapper(executor, callback, mAttributionSource);

                service.registerApp(sdp, inQos, outQos, cbw, mAttributionSource, recv);

                service.registerApp(sdp, inQos, outQos, cbw, mAttributionSource, recv);

                result = recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {

            } catch (RemoteException | TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            }

            }