Merge "Bluetooth: make it possible to advertise Transport Discovery Data" (d9257c2b) · Commits · e / os / android_packages_modules_Bluetooth

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

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ package com.android.bluetooth.gatt;

	import android.bluetooth.BluetoothUuid;		import android.bluetooth.BluetoothUuid;
	import android.bluetooth.le.AdvertiseData;		import android.bluetooth.le.AdvertiseData;
			import android.bluetooth.le.TransportDiscoveryData;
	import android.os.ParcelUuid;		import android.os.ParcelUuid;
	import android.util.Log;		import android.util.Log;

	@@ -41,6 +42,7 @@ class AdvertiseHelper {
	private static final int LIST_32_BIT_SERVICE_SOLICITATION_UUIDS = 0x1F;		private static final int LIST_32_BIT_SERVICE_SOLICITATION_UUIDS = 0x1F;
	private static final int SERVICE_DATA_32_BIT_UUID = 0X20;		private static final int SERVICE_DATA_32_BIT_UUID = 0X20;
	private static final int SERVICE_DATA_128_BIT_UUID = 0X21;		private static final int SERVICE_DATA_128_BIT_UUID = 0X21;
			private static final int TRANSPORT_DISCOVERY_DATA = 0X26;
	private static final int MANUFACTURER_SPECIFIC_DATA = 0XFF;		private static final int MANUFACTURER_SPECIFIC_DATA = 0XFF;

	public static byte[] advertiseDataToBytes(AdvertiseData data, String name) {		public static byte[] advertiseDataToBytes(AdvertiseData data, String name) {
	@@ -205,6 +207,13 @@ class AdvertiseHelper {
	ret.write(serviceUuids128.toByteArray(), 0, serviceUuids128.size());		ret.write(serviceUuids128.toByteArray(), 0, serviceUuids128.size());
	}		}
	}		}

			for (TransportDiscoveryData transportDiscoveryData : data.getTransportDiscoveryData()) {
			ret.write(transportDiscoveryData.totalBytes() + 1);
			ret.write(TRANSPORT_DISCOVERY_DATA);
			ret.write(transportDiscoveryData.toByteArray(),
			0, transportDiscoveryData.totalBytes());
			}
	return ret.toByteArray();		return ret.toByteArray();
	}		}
	}		}