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

Commit ba3ff279 authored by vnori's avatar vnori Committed by android-build-merger
Browse files

Merge "cleanup statemachines for all profiles so their output looks the same... 

Merge "cleanup statemachines for all profiles so their output looks the same for all profiles." am: cdc4acab
am: 0cb9124c

Change-Id: I77dfd3d034b56b11c4f27c238d3ed9e18fbbaf77
parents 624ed25e 0cb9124c

src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java

+3 −2
Original line number Diff line number Diff line
@@ -177,10 +177,11 @@ public class A2dpSinkStateMachine extends StateMachine { 
    }



    public void dump(StringBuilder sb) {

        ProfileService.println(sb, "mCurrentDevice: " + mCurrentDevice);

        if (mCurrentDevice == null) return;

        ProfileService.println(sb, "mCurrentDevice: " + mCurrentDevice.getAddress() + "("

                + mCurrentDevice.getName() + ") " + this.toString());

        ProfileService.println(sb, "mTargetDevice: " + mTargetDevice);

        ProfileService.println(sb, "mIncomingDevice: " + mIncomingDevice);

        ProfileService.println(sb, "StateMachine: " + this.toString());

    }



    private class Disconnected extends State {

src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java

+4 −1
Original line number Diff line number Diff line
@@ -999,7 +999,10 @@ class AvrcpControllerStateMachine extends StateMachine { 
    }



    void dump(StringBuilder sb) {

        ProfileService.println(sb, "StateMachine: " + this.toString());

        BluetoothDevice device = mRemoteDevice.mBTDevice;

        if (device == null) return;

        ProfileService.println(sb, "mCurrentDevice: " + device.getAddress() + "("

                + device.getName() + ") " + this.toString());

    }



    MediaMetadata getCurrentMetaData() {

src/com/android/bluetooth/hfpclient/HeadsetClientService.java

+0 −2
Original line number Diff line number Diff line
@@ -915,8 +915,6 @@ public class HeadsetClientService extends ProfileService { 
        super.dump(sb);

        for (HeadsetClientStateMachine sm : mStateMachineMap.values()) {

            if (sm != null) {

                println(sb, "State machine:");

                println(sb, "=============");

                sm.dump(sb);

            }

        }

src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java

+3 −4
Original line number Diff line number Diff line
@@ -185,7 +185,9 @@ public class HeadsetClientStateMachine extends StateMachine { 
    }



    public void dump(StringBuilder sb) {

        ProfileService.println(sb, "mCurrentDevice: " + mCurrentDevice);

        if (mCurrentDevice == null) return;

        ProfileService.println(sb, "mCurrentDevice: " + mCurrentDevice.getAddress() + "("

                + mCurrentDevice.getName() + ") " + this.toString());

        ProfileService.println(sb, "mAudioState: " + mAudioState);

        ProfileService.println(sb, "mAudioWbs: " + mAudioWbs);

        ProfileService.println(sb, "mIndicatorNetworkState: " + mIndicatorNetworkState);
@@ -208,9 +210,6 @@ public class HeadsetClientStateMachine extends StateMachine { 
                ProfileService.println(sb, "  " + call);

            }

        }



        ProfileService.println(sb, "State machine stats:");

        ProfileService.println(sb, this.toString());

    }



    private void clearPendingAction() {

src/com/android/bluetooth/mapclient/MapClientService.java

+0 −1
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ public class MapClientService extends ProfileService { 
    @Override

    public void dump(StringBuilder sb) {

        super.dump(sb);

        ProfileService.println(sb, "# Services Connected: " + mMapInstanceMap.size());

        for (MceStateMachine stateMachine : mMapInstanceMap.values()) {

            stateMachine.dump(sb);

        }