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

Commit 93d0bf4f authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Gerrit Code Review
Browse files

Merge changes I44a43f1f,Iba99aed0,I1d2a2560 

* changes:
  DatabaseMangerTest: Minor comment fix
  leaudio: Add dumpsys from state machine
  leaudio: Remove deprecated flags
parents 6d0f8fb7 a337f1ef

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+3 −1
Original line number Diff line number Diff line
@@ -1513,6 +1513,8 @@ public class LeAudioService extends ProfileService { 
    @Override

    public void dump(StringBuilder sb) {

        super.dump(sb);

        // TODO: Dump all state machines

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

            sm.dump(sb);

        }

    }

}

android/app/src/com/android/bluetooth/le_audio/LeAudioStackEvent.java

+0 −2
Original line number Diff line number Diff line
@@ -149,8 +149,6 @@ public class LeAudioStackEvent { 


    private static String eventTypeValue3ToString(int type, int value) {

        switch (type) {

            case EVENT_TYPE_GROUP_STATUS_CHANGED:

                return "{group_flags:" + Integer.toString(value) + "}";

            case EVENT_TYPE_AUDIO_CONF_CHANGED:

                // FIXME: It should have proper location names here

                return "{snk_audio_loc:" + value + "}";

android/app/src/com/android/bluetooth/le_audio/LeAudioStateMachine.java

+23 −0
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.util.State;

import com.android.internal.util.StateMachine;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.io.StringWriter;

import java.util.Scanner;



final class LeAudioStateMachine extends StateMachine {

    private static final boolean DBG = false;

    private static final String TAG = "LeAudioStateMachine";
@@ -553,6 +558,24 @@ final class LeAudioStateMachine extends StateMachine { 
        return Integer.toString(state);

    }



    public void dump(StringBuilder sb) {

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

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

        // Dump the state machine logs

        StringWriter stringWriter = new StringWriter();

        PrintWriter printWriter = new PrintWriter(stringWriter);

        super.dump(new FileDescriptor(), printWriter, new String[]{});

        printWriter.flush();

        stringWriter.flush();

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

        Scanner scanner = new Scanner(stringWriter.toString());

        while (scanner.hasNextLine()) {

            String line = scanner.nextLine();

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

        }

        scanner.close();

    }



    @Override

    protected void log(String msg) {

        if (DBG) {

android/app/tests/unit/src/com/android/bluetooth/btservice/storage/DatabaseManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ public final class DatabaseManagerTest { 
        device.put("migrated", false);

        assertThat(db.insert("metadata", SQLiteDatabase.CONFLICT_IGNORE, device),

                CoreMatchers.not(-1));

        // Migrate database from 106 to 107

        // Migrate database from 107 to 108

        db.close();

        db = testHelper.runMigrationsAndValidate(DB_NAME, 108, true,

                MetadataDatabase.MIGRATION_107_108);