Reduce GATT logging output (975344c7) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/gatt/GattService.java

+20 −19

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ import java.util.concurrent.TimeUnit;
		*/
		public class GattService extends ProfileService {
		private static final boolean DBG = GattServiceConfig.DBG;
		private static final boolean VDBG = GattServiceConfig.VDBG;
		private static final String TAG = GattServiceConfig.TAG_PREFIX + "GattService";

		static final int SCAN_FILTER_ENABLED = 1;
		@@ -563,7 +564,7 @@ public class GattService extends ProfileService {
		*************************************************************************/

		void onScanResult(String address, int rssi, byte[] adv_data) {
		if (DBG) Log.d(TAG, "onScanResult() - address=" + address
		if (VDBG) Log.d(TAG, "onScanResult() - address=" + address
		+ ", rssi=" + rssi);

		List<UUID> remoteUuids = parseUuids(adv_data);
		@@ -678,7 +679,7 @@ public class GattService extends ProfileService {
		UUID uuid = new UUID(srvcUuidMsb, srvcUuidLsb);
		String address = mClientMap.addressByConnId(connId);

		if (DBG) Log.d(TAG, "onSearchResult() - address=" + address + ", uuid=" + uuid);
		if (VDBG) Log.d(TAG, "onSearchResult() - address=" + address + ", uuid=" + uuid);

		mSearchQueue.add(connId, srvcType, srvcInstId, srvcUuidLsb, srvcUuidMsb);

		@@ -698,7 +699,7 @@ public class GattService extends ProfileService {
		UUID charUuid = new UUID(charUuidMsb, charUuidLsb);
		String address = mClientMap.addressByConnId(connId);

		if (DBG) Log.d(TAG, "onGetCharacteristic() - address=" + address
		if (VDBG) Log.d(TAG, "onGetCharacteristic() - address=" + address
		+ ", status=" + status + ", charUuid=" + charUuid + ", prop=" + charProp);

		if (status == 0) {
		@@ -735,7 +736,7 @@ public class GattService extends ProfileService {
		UUID descUuid = new UUID(descrUuidMsb, descrUuidLsb);
		String address = mClientMap.addressByConnId(connId);

		if (DBG) Log.d(TAG, "onGetDescriptor() - address=" + address
		if (VDBG) Log.d(TAG, "onGetDescriptor() - address=" + address
		+ ", status=" + status + ", descUuid=" + descUuid);

		if (status == 0) {
		@@ -766,7 +767,7 @@ public class GattService extends ProfileService {
		UUID inclSrvcUuid = new UUID(inclSrvcUuidMsb, inclSrvcUuidLsb);
		String address = mClientMap.addressByConnId(connId);

		if (DBG) Log.d(TAG, "onGetIncludedService() - address=" + address
		if (VDBG) Log.d(TAG, "onGetIncludedService() - address=" + address
		+ ", status=" + status + ", uuid=" + srvcUuid
		+ ", inclUuid=" + inclSrvcUuid);

		@@ -807,7 +808,7 @@ public class GattService extends ProfileService {
		UUID srvcUuid = new UUID(srvcUuidMsb, srvcUuidLsb);
		UUID charUuid = new UUID(charUuidMsb, charUuidLsb);

		if (DBG) Log.d(TAG, "onNotify() - address=" + address
		if (VDBG) Log.d(TAG, "onNotify() - address=" + address
		+ ", charUuid=" + charUuid + ", length=" + data.length);

		ClientMap.App app = mClientMap.getByConnId(connId);
		@@ -828,7 +829,7 @@ public class GattService extends ProfileService {
		UUID charUuid = new UUID(charUuidMsb, charUuidLsb);
		String address = mClientMap.addressByConnId(connId);

		if (DBG) Log.d(TAG, "onReadCharacteristic() - address=" + address
		if (VDBG) Log.d(TAG, "onReadCharacteristic() - address=" + address
		+ ", status=" + status + ", length=" + data.length);

		ClientMap.App app = mClientMap.getByConnId(connId);
		@@ -848,7 +849,7 @@ public class GattService extends ProfileService {
		UUID charUuid = new UUID(charUuidMsb, charUuidLsb);
		String address = mClientMap.addressByConnId(connId);

		if (DBG) Log.d(TAG, "onWriteCharacteristic() - address=" + address
		if (VDBG) Log.d(TAG, "onWriteCharacteristic() - address=" + address
		+ ", status=" + status);

		ClientMap.App app = mClientMap.getByConnId(connId);
		@@ -861,7 +862,7 @@ public class GattService extends ProfileService {

		void onExecuteCompleted(int connId, int status) throws RemoteException {
		String address = mClientMap.addressByConnId(connId);
		if (DBG) Log.d(TAG, "onExecuteCompleted() - address=" + address
		if (VDBG) Log.d(TAG, "onExecuteCompleted() - address=" + address
		+ ", status=" + status);

		ClientMap.App app = mClientMap.getByConnId(connId);
		@@ -881,7 +882,7 @@ public class GattService extends ProfileService {
		UUID descrUuid = new UUID(descrUuidMsb, descrUuidLsb);
		String address = mClientMap.addressByConnId(connId);

		if (DBG) Log.d(TAG, "onReadDescriptor() - address=" + address
		if (VDBG) Log.d(TAG, "onReadDescriptor() - address=" + address
		+ ", status=" + status + ", length=" + data.length);

		ClientMap.App app = mClientMap.getByConnId(connId);
		@@ -903,7 +904,7 @@ public class GattService extends ProfileService {
		UUID descrUuid = new UUID(descrUuidMsb, descrUuidLsb);
		String address = mClientMap.addressByConnId(connId);

		if (DBG) Log.d(TAG, "onWriteDescriptor() - address=" + address
		if (VDBG) Log.d(TAG, "onWriteDescriptor() - address=" + address
		+ ", status=" + status);

		ClientMap.App app = mClientMap.getByConnId(connId);
		@@ -1465,7 +1466,7 @@ public class GattService extends ProfileService {
		int charInstanceId, UUID charUuid, int authReq) {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

		if (DBG) Log.d(TAG, "readCharacteristic() - address=" + address);
		if (VDBG) Log.d(TAG, "readCharacteristic() - address=" + address);

		Integer connId = mClientMap.connIdByAddress(clientIf, address);
		if (connId != null)
		@@ -1484,7 +1485,7 @@ public class GattService extends ProfileService {
		int authReq, byte[] value) {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

		if (DBG) Log.d(TAG, "writeCharacteristic() - address=" + address);
		if (VDBG) Log.d(TAG, "writeCharacteristic() - address=" + address);

		if (mReliableQueue.contains(address)) writeType = 3; // Prepared write

		@@ -1506,7 +1507,7 @@ public class GattService extends ProfileService {
		int authReq) {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

		if (DBG) Log.d(TAG, "readDescriptor() - address=" + address);
		if (VDBG) Log.d(TAG, "readDescriptor() - address=" + address);

		Integer connId = mClientMap.connIdByAddress(clientIf, address);
		if (connId != null)
		@@ -1529,7 +1530,7 @@ public class GattService extends ProfileService {
		int writeType, int authReq, byte[] value) {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

		if (DBG) Log.d(TAG, "writeDescriptor() - address=" + address);
		if (VDBG) Log.d(TAG, "writeDescriptor() - address=" + address);

		Integer connId = mClientMap.connIdByAddress(clientIf, address);
		if (connId != null)
		@@ -1741,7 +1742,7 @@ public class GattService extends ProfileService {
		void onAttributeRead(String address, int connId, int transId,
		int attrHandle, int offset, boolean isLong)
		throws RemoteException {
		if (DBG) Log.d(TAG, "onAttributeRead() connId=" + connId
		if (VDBG) Log.d(TAG, "onAttributeRead() connId=" + connId
		+ ", address=" + address + ", handle=" + attrHandle
		+ ", requestId=" + transId + ", offset=" + offset);

		@@ -1790,7 +1791,7 @@ public class GattService extends ProfileService {
		boolean needRsp, boolean isPrep,
		byte[] data)
		throws RemoteException {
		if (DBG) Log.d(TAG, "onAttributeWrite() connId=" + connId
		if (VDBG) Log.d(TAG, "onAttributeWrite() connId=" + connId
		+ ", address=" + address + ", handle=" + attrHandle
		+ ", requestId=" + transId + ", isPrep=" + isPrep
		+ ", offset=" + offset);
		@@ -1982,7 +1983,7 @@ public class GattService extends ProfileService {
		int status, int offset, byte[] value) {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

		if (DBG) Log.d(TAG, "sendResponse() - address=" + address);
		if (VDBG) Log.d(TAG, "sendResponse() - address=" + address);

		int handle = 0;
		HandleMap.Entry entry = mHandleMap.getByRequestId(requestId);
		@@ -2000,7 +2001,7 @@ public class GattService extends ProfileService {
		boolean confirm, byte[] value) {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

		if (DBG) Log.d(TAG, "sendNotification() - address=" + address);
		if (VDBG) Log.d(TAG, "sendNotification() - address=" + address);

		int srvcHandle = mHandleMap.getServiceHandle(srvcUuid, srvcType, srvcInstanceId);
		if (srvcHandle == 0) return;

android/app/src/com/android/bluetooth/gatt/GattServiceConfig.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ package com.android.bluetooth.gatt;
		*/
		/package/ class GattServiceConfig {
		public static final boolean DBG = true;
		public static final boolean VDBG = false;
		public static final String TAG_PREFIX = "BtGatt.";
		public static final boolean DEBUG_ADMIN = true;
		}