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

Commit cc1b96c0 authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "add connection state's name to the log" into main am: 001085cd am: 901ab8e9 

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



Change-Id: Ie3714530c0ab2485c0fe215af57c2f3b93d78dad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 869107fc 901ab8e9

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

+17 −0
Original line number Diff line number Diff line
@@ -83,4 +83,21 @@ public final class HeadsetHalConstants { 
    static final int BTHF_SWB_NONE = 0;

    static final int BTHF_SWB_NO = 1;

    static final int BTHF_SWB_YES = 2;



    static String getConnectionStateName(int state) {

        switch (state) {

            case CONNECTION_STATE_DISCONNECTED:

                return "CONNECTION_STATE_DISCONNECTED";

            case CONNECTION_STATE_CONNECTING:

                return "CONNECTION_STATE_CONNECTING";

            case CONNECTION_STATE_CONNECTED:

                return "CONNECTION_STATE_CONNECTED";

            case CONNECTION_STATE_SLC_CONNECTED:

                return "CONNECTION_STATE_SLC_CONNECTED";

            case CONNECTION_STATE_DISCONNECTING:

                return "CONNECTION_STATE_DISCONNECTING";

            default:

                return "UNKNOWN STATE!!!";

        }

    }

}

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

+12 −4
Original line number Diff line number Diff line
@@ -458,7 +458,14 @@ public class HeadsetStateMachine extends StateMachine { 
         * @param message the current message for the event

         * @param state connection state to transition to

         */

        public abstract void processConnectionEvent(Message message, int state);

        public void processConnectionEvent(Message message, int state) {

            stateLogD(

                    "processConnectionEvent, state="

                            + HeadsetHalConstants.getConnectionStateName(state)

                            + "["

                            + state

                            + "]");

        }



        /**

         * Get a state value from {@link BluetoothProfile} that represents the connection state of
@@ -577,7 +584,7 @@ public class HeadsetStateMachine extends StateMachine { 


        @Override

        public void processConnectionEvent(Message message, int state) {

            stateLogD("processConnectionEvent, state=" + state);

            super.processConnectionEvent(message, state);

            switch (state) {

                case HeadsetHalConstants.CONNECTION_STATE_DISCONNECTED:

                    stateLogW("ignore DISCONNECTED event");
@@ -772,7 +779,7 @@ public class HeadsetStateMachine extends StateMachine { 


        @Override

        public void processConnectionEvent(Message message, int state) {

            stateLogD("processConnectionEvent, state=" + state);

            super.processConnectionEvent(message, state);

            switch (state) {

                case HeadsetHalConstants.CONNECTION_STATE_DISCONNECTED:

                    stateLogW("Disconnected");
@@ -867,6 +874,7 @@ public class HeadsetStateMachine extends StateMachine { 
        // in Disconnecting state

        @Override

        public void processConnectionEvent(Message message, int state) {

            super.processConnectionEvent(message, state);

            switch (state) {

                case HeadsetHalConstants.CONNECTION_STATE_DISCONNECTED:

                    stateLogD("processConnectionEvent: Disconnected");
@@ -1092,7 +1100,7 @@ public class HeadsetStateMachine extends StateMachine { 


        @Override

        public void processConnectionEvent(Message message, int state) {

            stateLogD("processConnectionEvent, state=" + state);

            super.processConnectionEvent(message, state);

            switch (state) {

                case HeadsetHalConstants.CONNECTION_STATE_CONNECTED:

                    stateLogE("processConnectionEvent: RFCOMM connected again, shouldn't happen");