Merge "Resolve usage of hidden logging APIs" (33550fde) · Commits · e / os / android_packages_modules_Bluetooth

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ public class A2dpNativeInterface {
		private A2dpNativeInterface() {
		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/a2dp/A2dpStateMachine.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -199,7 +199,7 @@ final class A2dpStateMachine extends StateMachine {
		A2dpStackEvent event = (A2dpStackEvent) message.obj;
		log("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 A2dpStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:
		@@ -306,7 +306,7 @@ final class A2dpStateMachine extends StateMachine {
		A2dpStackEvent event = (A2dpStackEvent) 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 A2dpStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:
		@@ -399,7 +399,7 @@ final class A2dpStateMachine extends StateMachine {
		A2dpStackEvent event = (A2dpStackEvent) 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 A2dpStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:
		@@ -509,7 +509,7 @@ final class A2dpStateMachine extends StateMachine {
		A2dpStackEvent event = (A2dpStackEvent) 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 A2dpStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:

android/app/src/com/android/bluetooth/avrcp/AvrcpTargetService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ public class AvrcpTargetService extends ProfileService {
		@Override
		protected boolean start() {
		if (sInstance != null) {
		Log.wtfStack(TAG, "The service has already been initialized");
		Log.wtf(TAG, "The service has already been initialized");
		return false;
		}

		@@ -343,7 +343,7 @@ public class AvrcpTargetService extends ProfileService {
		void setActiveDevice(BluetoothDevice device) {
		Log.i(TAG, "setActiveDevice: device=" + device);
		if (device == null) {
		Log.wtfStack(TAG, "setActiveDevice: could not find device " + device);
		Log.wtf(TAG, "setActiveDevice: could not find device " + device);
		}
		A2dpService.getA2dpService().setActiveDevice(device);
		}

android/app/src/com/android/bluetooth/avrcp/BrowsablePlayerConnector.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ public class BrowsablePlayerConnector {
		return sInjectConnector;
		}
		if (cb == null) {
		Log.wtfStack(TAG, "Null callback passed");
		Log.wtf(TAG, "Null callback passed");
		return null;
		}

android/app/src/com/android/bluetooth/avrcp/BrowsedPlayerWrapper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ class BrowsedPlayerWrapper {
		*/
		boolean connect(ConnectionCallback cb) {
		if (cb == null) {
		Log.wtfStack(TAG, "connect: Trying to connect to " + mPackageName
		Log.wtf(TAG, "connect: Trying to connect to " + mPackageName
		+ "with null callback");
		}
		return setCallbackAndConnect((int status, BrowsedPlayerWrapper wrapper) -> {
		@@ -245,7 +245,7 @@ class BrowsedPlayerWrapper {
		}

		if (cb == null) {
		Log.wtfStack(TAG, "getFolderItems: Trying to connect to " + mPackageName
		Log.wtf(TAG, "getFolderItems: Trying to connect to " + mPackageName
		+ "with null browse callback");
		}