Merge "Fix typos for SdpManager" into main (2298a480) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/sdp/SdpManager.java

+82 −23

Original line number	Diff line number	Diff line
		@@ -216,10 +216,18 @@ public class SdpManager {
		}
		}


		void sdpMasRecordFoundCallback(int status, byte[] address, byte[] uuid, int masInstanceId,
		int l2capPsm, int rfcommCannelNumber, int profileVersion, int supportedFeatures,
		int supportedMessageTypes, String serviceName, boolean moreResults) {
		void sdpMasRecordFoundCallback(
		int status,
		byte[] address,
		byte[] uuid,
		int masInstanceId,
		int l2capPsm,
		int rfcommChannelNumber,
		int profileVersion,
		int supportedFeatures,
		int supportedMessageTypes,
		String serviceName,
		boolean moreResults) {

		synchronized (TRACKER_LOCK) {
		SdpSearchInstance inst = mSdpSearchTracker.getSearchInstance(address, uuid);
		@@ -230,8 +238,15 @@ public class SdpManager {
		}
		inst.setStatus(status);
		if (status == AbstractionLayer.BT_STATUS_SUCCESS) {
		sdpRecord = new SdpMasRecord(masInstanceId, l2capPsm, rfcommCannelNumber,
		profileVersion, supportedFeatures, supportedMessageTypes, serviceName);
		sdpRecord =
		new SdpMasRecord(
		masInstanceId,
		l2capPsm,
		rfcommChannelNumber,
		profileVersion,
		supportedFeatures,
		supportedMessageTypes,
		serviceName);
		}
		Log.d(TAG, "UUID: " + Arrays.toString(uuid));
		Log.d(TAG, "UUID in parcel: " + ((Utils.byteArrayToUuid(uuid))[0]).toString());
		@@ -239,8 +254,15 @@ public class SdpManager {
		}
		}

		void sdpMnsRecordFoundCallback(int status, byte[] address, byte[] uuid, int l2capPsm,
		int rfcommCannelNumber, int profileVersion, int supportedFeatures, String serviceName,
		void sdpMnsRecordFoundCallback(
		int status,
		byte[] address,
		byte[] uuid,
		int l2capPsm,
		int rfcommChannelNumber,
		int profileVersion,
		int supportedFeatures,
		String serviceName,
		boolean moreResults) {
		synchronized (TRACKER_LOCK) {
		SdpSearchInstance inst = mSdpSearchTracker.getSearchInstance(address, uuid);
		@@ -251,8 +273,13 @@ public class SdpManager {
		}
		inst.setStatus(status);
		if (status == AbstractionLayer.BT_STATUS_SUCCESS) {
		sdpRecord = new SdpMnsRecord(l2capPsm, rfcommCannelNumber, profileVersion,
		supportedFeatures, serviceName);
		sdpRecord =
		new SdpMnsRecord(
		l2capPsm,
		rfcommChannelNumber,
		profileVersion,
		supportedFeatures,
		serviceName);
		}
		Log.d(TAG, "UUID: " + Arrays.toString(uuid));
		Log.d(TAG, "UUID in parcel: " + ((Utils.byteArrayToUuid(uuid))[0]).toString());
		@@ -260,9 +287,17 @@ public class SdpManager {
		}
		}

		void sdpPseRecordFoundCallback(int status, byte[] address, byte[] uuid, int l2capPsm,
		int rfcommCannelNumber, int profileVersion, int supportedFeatures,
		int supportedRepositories, String serviceName, boolean moreResults) {
		void sdpPseRecordFoundCallback(
		int status,
		byte[] address,
		byte[] uuid,
		int l2capPsm,
		int rfcommChannelNumber,
		int profileVersion,
		int supportedFeatures,
		int supportedRepositories,
		String serviceName,
		boolean moreResults) {
		synchronized (TRACKER_LOCK) {
		SdpSearchInstance inst = mSdpSearchTracker.getSearchInstance(address, uuid);
		SdpPseRecord sdpRecord = null;
		@@ -272,8 +307,14 @@ public class SdpManager {
		}
		inst.setStatus(status);
		if (status == AbstractionLayer.BT_STATUS_SUCCESS) {
		sdpRecord = new SdpPseRecord(l2capPsm, rfcommCannelNumber, profileVersion,
		supportedFeatures, supportedRepositories, serviceName);
		sdpRecord =
		new SdpPseRecord(
		l2capPsm,
		rfcommChannelNumber,
		profileVersion,
		supportedFeatures,
		supportedRepositories,
		serviceName);
		}
		Log.d(TAG, "UUID: " + Arrays.toString(uuid));
		Log.d(TAG, "UUID in parcel: " + ((Utils.byteArrayToUuid(uuid))[0]).toString());
		@@ -281,8 +322,15 @@ public class SdpManager {
		}
		}

		void sdpOppOpsRecordFoundCallback(int status, byte[] address, byte[] uuid, int l2capPsm,
		int rfcommCannelNumber, int profileVersion, String serviceName, byte[] formatsList,
		void sdpOppOpsRecordFoundCallback(
		int status,
		byte[] address,
		byte[] uuid,
		int l2capPsm,
		int rfcommChannelNumber,
		int profileVersion,
		String serviceName,
		byte[] formatsList,
		boolean moreResults) {

		synchronized (TRACKER_LOCK) {
		@@ -295,8 +343,13 @@ public class SdpManager {
		}
		inst.setStatus(status);
		if (status == AbstractionLayer.BT_STATUS_SUCCESS) {
		sdpRecord = new SdpOppOpsRecord(serviceName, rfcommCannelNumber, l2capPsm,
		profileVersion, formatsList);
		sdpRecord =
		new SdpOppOpsRecord(
		serviceName,
		rfcommChannelNumber,
		l2capPsm,
		profileVersion,
		formatsList);
		}
		Log.d(TAG, "UUID: " + Arrays.toString(uuid));
		Log.d(TAG, "UUID in parcel: " + ((Utils.byteArrayToUuid(uuid))[0]).toString());
		@@ -304,8 +357,14 @@ public class SdpManager {
		}
		}

		void sdpSapsRecordFoundCallback(int status, byte[] address, byte[] uuid, int rfcommCannelNumber,
		int profileVersion, String serviceName, boolean moreResults) {
		void sdpSapsRecordFoundCallback(
		int status,
		byte[] address,
		byte[] uuid,
		int rfcommChannelNumber,
		int profileVersion,
		String serviceName,
		boolean moreResults) {

		synchronized (TRACKER_LOCK) {
		SdpSearchInstance inst = mSdpSearchTracker.getSearchInstance(address, uuid);
		@@ -316,7 +375,7 @@ public class SdpManager {
		}
		inst.setStatus(status);
		if (status == AbstractionLayer.BT_STATUS_SUCCESS) {
		sdpRecord = new SdpSapsRecord(rfcommCannelNumber, profileVersion, serviceName);
		sdpRecord = new SdpSapsRecord(rfcommChannelNumber, profileVersion, serviceName);
		}
		Log.d(TAG, "UUID: " + Arrays.toString(uuid));
		Log.d(TAG, "UUID in parcel: " + ((Utils.byteArrayToUuid(uuid))[0]).toString());