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

Commit 5c4f9dea authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "A2DP: Add more messages when doing bluetooth_manager dump" am: 57f38bb0 

Change-Id: Icf2b23de49b73bb52d6300fc4e2c41edaeeb6e5e
parents fc346e90 57f38bb0

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

+17 −0
Original line number Diff line number Diff line
@@ -1386,6 +1386,23 @@ public class A2dpService extends ProfileService { 
    public void dump(StringBuilder sb) {

        super.dump(sb);

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

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

        if (mA2dpCodecConfig != null) {

            ProfileService.println(sb, "codecConfigPriorities:");

            for (BluetoothCodecConfig codecConfig : mA2dpCodecConfig.codecConfigPriorities()) {

                ProfileService.println(sb, "  " + codecConfig.getCodecName() + ": "

                        + codecConfig.getCodecPriority());

            }

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

            if (mA2dpOffloadEnabled) {

                ProfileService.println(sb, "codecConfigOffloading:");

                for (BluetoothCodecConfig codecConfig : mA2dpCodecConfig.codecConfigOffloading()) {

                    ProfileService.println(sb, "  " + codecConfig);

                }

            }

        } else {

            ProfileService.println(sb, "mA2dpCodecConfig: null");

        }

        for (A2dpStateMachine sm : mStateMachines.values()) {

            sm.dump(sb);

        }

android/app/src/com/android/bluetooth/a2dp/A2dpStateMachine.java

+16 −2
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.io.StringWriter;

import java.util.Objects;

import java.util.Scanner;



final class A2dpStateMachine extends StateMachine {
@@ -765,14 +766,27 @@ final class A2dpStateMachine extends StateMachine { 
    }



    public void dump(StringBuilder sb) {

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

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

        boolean isActive = Objects.equals(mDevice, mA2dpService.getActiveDevice());

        ProfileService.println(sb,

                "=== A2dpStateMachine for " + mDevice + (isActive ? " (Active) ===" : " ==="));

        ProfileService.println(sb,

                "  getConnectionPolicy: " + mA2dpService.getConnectionPolicy(mDevice));

        ProfileService.println(sb, "  mConnectionState: " + profileStateToString(mConnectionState)

                + ", mLastConnectionState: " + profileStateToString(mLastConnectionState));

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

        ProfileService.println(sb,

                "  getSupportsOptionalCodecs: " + mA2dpService.getSupportsOptionalCodecs(mDevice)

                + ", getOptionalCodecsEnabled: " + mA2dpService.getOptionalCodecsEnabled(mDevice));

        synchronized (this) {

            if (mCodecStatus != null) {

                ProfileService.println(sb, "  mCodecConfig: " + mCodecStatus.getCodecConfig());

                ProfileService.println(sb, "  mCodecsSelectableCapabilities:");

                for (BluetoothCodecConfig config : mCodecStatus.getCodecsSelectableCapabilities()) {

                    ProfileService.println(sb, "    " + config);

                }

            }

        }

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

        // Dump the state machine logs

        StringWriter stringWriter = new StringWriter();

        PrintWriter printWriter = new PrintWriter(stringWriter);