Merge "Clean hidden api - Log.wtfStack" (e38e305a) · Commits · e / os / android_packages_modules_Bluetooth

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
		@@ -174,7 +174,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:
		@@ -274,7 +274,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:
		@@ -359,7 +359,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:
		@@ -452,7 +452,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
		@@ -152,7 +152,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:
		@@ -258,7 +258,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:
		@@ -361,7 +361,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:
		@@ -456,7 +456,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: