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

Commit d8ce8370 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clean hidden api - Log.wtfStack" am: e38e305a am: 0fee421d 

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

Change-Id: I3669a24665b347901086770794a46fbc8f8af116
parents 04c5c169 0fee421d

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

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class LeAudioNativeInterface { 
    private LeAudioNativeInterface() {

        mAdapter = BluetoothAdapter.getDefaultAdapter();

        if (mAdapter == null) {

            Log.wtfStack(TAG, "No Bluetooth Adapter Available");

            Log.wtf(TAG, "No Bluetooth Adapter Available");

        }

    }

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

+4 −4
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ final class LeAudioStateMachine extends StateMachine { 
                        Log.d(TAG, "Disconnected: stack event: " + event);

                    }

                    if (!mDevice.equals(event.device)) {

                        Log.wtfStack(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                        Log.wtf(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                    }

                    switch (event.type) {

                        case LeAudioStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:
@@ -278,7 +278,7 @@ final class LeAudioStateMachine extends StateMachine { 
                    LeAudioStackEvent event = (LeAudioStackEvent) message.obj;

                    log("Connecting: stack event: " + event);

                    if (!mDevice.equals(event.device)) {

                        Log.wtfStack(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                        Log.wtf(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                    }

                    switch (event.type) {

                        case LeAudioStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:
@@ -363,7 +363,7 @@ final class LeAudioStateMachine extends StateMachine { 
                    LeAudioStackEvent event = (LeAudioStackEvent) message.obj;

                    log("Disconnecting: stack event: " + event);

                    if (!mDevice.equals(event.device)) {

                        Log.wtfStack(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                        Log.wtf(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                    }

                    switch (event.type) {

                        case LeAudioStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:
@@ -456,7 +456,7 @@ final class LeAudioStateMachine extends StateMachine { 
                    LeAudioStackEvent event = (LeAudioStackEvent) message.obj;

                    log("Connected: stack event: " + event);

                    if (!mDevice.equals(event.device)) {

                        Log.wtfStack(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                        Log.wtf(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                    }

                    switch (event.type) {

                        case LeAudioStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:

android/app/src/com/android/bluetooth/vc/VolumeControlNativeInterface.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ public class VolumeControlNativeInterface { 
    private VolumeControlNativeInterface() {

        mAdapter = BluetoothAdapter.getDefaultAdapter();

        if (mAdapter == null) {

            Log.wtfStack(TAG, "No Bluetooth Adapter Available");

            Log.wtf(TAG, "No Bluetooth Adapter Available");

        }

    }

android/app/src/com/android/bluetooth/vc/VolumeControlStateMachine.java

+4 −4
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public class VolumeControlStateMachine extends StateMachine { 
                        Log.d(TAG, "Disconnected: stack event: " + event);

                    }

                    if (!mDevice.equals(event.device)) {

                        Log.wtfStack(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                        Log.wtf(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                    }

                    switch (event.type) {

                        case VolumeControlStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:
@@ -260,7 +260,7 @@ public class VolumeControlStateMachine extends StateMachine { 
                    VolumeControlStackEvent event = (VolumeControlStackEvent) message.obj;

                    log("Connecting: stack event: " + event);

                    if (!mDevice.equals(event.device)) {

                        Log.wtfStack(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                        Log.wtf(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                    }

                    switch (event.type) {

                        case VolumeControlStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:
@@ -363,7 +363,7 @@ public class VolumeControlStateMachine extends StateMachine { 
                    VolumeControlStackEvent event = (VolumeControlStackEvent) message.obj;

                    log("Disconnecting: stack event: " + event);

                    if (!mDevice.equals(event.device)) {

                        Log.wtfStack(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                        Log.wtf(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                    }

                    switch (event.type) {

                        case VolumeControlStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:
@@ -458,7 +458,7 @@ public class VolumeControlStateMachine extends StateMachine { 
                    VolumeControlStackEvent event = (VolumeControlStackEvent) message.obj;

                    log("Connected: stack event: " + event);

                    if (!mDevice.equals(event.device)) {

                        Log.wtfStack(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                        Log.wtf(TAG, "Device(" + mDevice + "): event mismatch: " + event);

                    }

                    switch (event.type) {

                        case VolumeControlStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED: