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

Commit f0f2633e authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "AdapterProperties: change log level and wording" am: f0b90bde am:... 

Merge "AdapterProperties: change log level and wording" am: f0b90bde am: 2fdb5476 am: 7137076d
am: 932393f5

Change-Id: I40aa35f662a3cf12a7d3a8f3d055b820e6b3f3ea
parents 708c5990 932393f5

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

+4 −4
Original line number Diff line number Diff line
@@ -454,8 +454,8 @@ class AdapterProperties { 
                "PROFILE_CONNECTION_STATE_CHANGE: profile=" + profile + ", device=" + device + ", "

                        + prevState + " -> " + state);

        if (!isNormalStateTransition(prevState, state)) {

            Log.e(TAG,

                    "PROFILE_CONNECTION_STATE_CHANGE: invalid transition for profile=" + profile

            Log.w(TAG,

                    "PROFILE_CONNECTION_STATE_CHANGE: unexpected transition for profile=" + profile

                            + ", device=" + device + ", " + prevState + " -> " + state);

        }

        sendConnectionStateChange(device, profile, state, prevState);
@@ -489,8 +489,8 @@ class AdapterProperties { 
                        "ADAPTER_CONNECTION_STATE_CHANGE: " + device + ": " + prevAdapterState

                                + " -> " + newAdapterState);

                if (!isNormalStateTransition(prevState, state)) {

                    Log.e(TAG,

                            "ADAPTER_CONNECTION_STATE_CHANGE: invalid transition for profile="

                    Log.w(TAG,

                            "ADAPTER_CONNECTION_STATE_CHANGE: unexpected transition for profile="

                                    + profile + ", device=" + device + ", " + prevState + " -> "

                                    + state);

                }