Merge "AudioDeviceInventory: fix sensor UUUID initialization for LE Audio" into udc-qpr-dev (3bb5367c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/UuidUtils.java

+18 −20

Original line number	Original line	Diff line number	Diff line
	@@ -45,8 +45,10 @@ class UuidUtils {
	* Generate a headtracking UUID from AudioDeviceAttributes		* Generate a headtracking UUID from AudioDeviceAttributes
	*/		*/
	public static UUID uuidFromAudioDeviceAttributes(AudioDeviceAttributes device) {		public static UUID uuidFromAudioDeviceAttributes(AudioDeviceAttributes device) {
	switch (device.getInternalType()) {		if (!AudioSystem.isBluetoothA2dpOutDevice(device.getInternalType())
	case AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP:		&& !AudioSystem.isBluetoothLeOutDevice(device.getInternalType())) {
			return null;
			}
	String address = device.getAddress().replace(":", "");		String address = device.getAddress().replace(":", "");
	if (address.length() != 12) {		if (address.length() != 12) {
	return null;		return null;
	@@ -62,9 +64,5 @@ class UuidUtils {
	Slog.i(TAG, "uuidFromAudioDeviceAttributes lsb: " + Long.toHexString(lsb));		Slog.i(TAG, "uuidFromAudioDeviceAttributes lsb: " + Long.toHexString(lsb));
	}		}
	return new UUID(0, lsb);		return new UUID(0, lsb);
	default:
	// Handle other device types here
	return null;
	}
	}		}
	}		}