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

Commit 674afad7 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

[conflict] Correct isDirect in BluetoothGatt#connect am: 213409cb am: 5450395a am: 5ed657b7 

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



Change-Id: I66baa07c506b38b9c32e995f08f2222d4a10c9b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb998284 5ed657b7

framework/java/android/bluetooth/BluetoothGatt.java

+6 −1
Original line number Diff line number Diff line
@@ -1030,9 +1030,14 @@ public final class BluetoothGatt implements BluetoothProfile { 
    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean connect() {

        try {

            if (DBG) {

                Log.d(TAG, "connect(void) - device: " + mDevice.getAddress()

                        + ", auto=" + mAutoConnect);

            }



            // autoConnect is inverse of "isDirect"

            final SynchronousResultReceiver recv = SynchronousResultReceiver.get();

            mService.clientConnect(mClientIf, mDevice.getAddress(), false, mTransport,

            mService.clientConnect(mClientIf, mDevice.getAddress(), !mAutoConnect, mTransport,

                    mOpportunistic, mPhy, mAttributionSource, recv);

            recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null);

            return true;