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

Commit 4c2f6f21 authored by Pomai Ahlo's avatar Pomai Ahlo Committed by Automerger Merge Worker
Browse files

Merge "BluetoothSocket: set connect() logs to info" into main am: 1c89f786 am: 49108ce0 

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



Change-Id: I6b5179c41972385ade820a6c9c2da01381bc3a1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1303d8b9 49108ce0

framework/java/android/bluetooth/BluetoothSocket.java

+2 −2
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ public final class BluetoothSocket implements Closeable { 
            }

            mPfd = socketManager.connectSocket(mDevice, mType, mUuid, mPort, getSecurityFlags());

            synchronized (this) {

                if (DBG) Log.d(TAG, "connect(), SocketState: " + mSocketState + ", mPfd: " + mPfd);

                Log.i(TAG, "connect(), SocketState: " + mSocketState + ", mPfd: " + mPfd);

                if (mSocketState == SocketState.CLOSED) {

                    throw new BluetoothSocketException(

                            BluetoothSocketException.SOCKET_CLOSED);
@@ -485,7 +485,7 @@ public final class BluetoothSocket implements Closeable { 
                    throw new BluetoothSocketException(BluetoothSocketException.SOCKET_CLOSED);

                }

                mSocketState = SocketState.CONNECTED;

                if (DBG) Log.d(TAG, "connect(), socket connected");

                Log.i(TAG, "connect(), socket connected. mPort=" + mPort);

            }

        } catch (BluetoothSocketException e) {

            SocketMetrics.logSocketConnect(