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

Commit ed3dde86 authored by Jack He's avatar Jack He
Browse files

HFP: HeadsetStateMachine logging clean-up 

* Enable logging at critical code path to indicate connection status
  more clearly
* Disable duplicate logging statements to reduce log spam
* Simplified method usages to reduce code size
* Remove unncessary null checks such as device null check in CONNECT
  message, we should crash if device is null in CONNECT message

Bug: 63775402
Test: HFP PTS test, HFP regression, no functional changes
Change-Id: I97d3e82e3e5cf3e4e2b702f6b3d8d054e0962272
Merged-In: I97d3e82e3e5cf3e4e2b702f6b3d8d054e0962272
(cherry picked from commit 5d162b2e)
parent f1229e7f

android/app/src/com/android/bluetooth/btservice/RemoteDevices.java

+2 −1
Original line number Diff line number Diff line
@@ -513,7 +513,8 @@ final class RemoteDevices { 
        BluetoothDevice device = getDevice(address);



        if (device == null) {

            errorLog("aclStateChangeCallback: Device is NULL");

            errorLog("aclStateChangeCallback: device is NULL, address="

                    + Utils.getAddressStringFromByte(address) + ", newState=" + newState);

            return;

        }

        int state = mAdapterService.getState();

android/app/src/com/android/bluetooth/hfp/HeadsetService.java

+9 −5
Original line number Diff line number Diff line
@@ -352,30 +352,34 @@ public class HeadsetService extends ProfileService { 


    public boolean connect(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH ADMIN permission");



        Log.d(TAG, "connect: device=" + device);

        if (getPriority(device) == BluetoothProfile.PRIORITY_OFF) {

            Log.w(TAG, "connect: PRIORITY_OFF, device=" + device);

            return false;

        }



        int connectionState = mStateMachine.getConnectionState(device);

        Log.d(TAG, "connectionState = " + connectionState);

        if (connectionState == BluetoothProfile.STATE_CONNECTED

                || connectionState == BluetoothProfile.STATE_CONNECTING) {

            Log.w(TAG,

                    "connect: already connected/connecting, connectionState=" + connectionState

                            + ", device=" + device);

            return false;

        }



        mStateMachine.sendMessage(HeadsetStateMachine.CONNECT, device);

        return true;

    }



    boolean disconnect(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH ADMIN permission");

        Log.d(TAG, "disconnect: device=" + device);

        int connectionState = mStateMachine.getConnectionState(device);

        if (connectionState != BluetoothProfile.STATE_CONNECTED

                && connectionState != BluetoothProfile.STATE_CONNECTING) {

            Log.w(TAG,

                    "disconnect: not connected/connecting, connectionState=" + connectionState

                            + ", device=" + device);

            return false;

        }



        mStateMachine.sendMessage(HeadsetStateMachine.DISCONNECT, device);

        return true;

    }

android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java

+143 −171

File changed.

Preview size limit exceeded, changes collapsed.