Snap for 12253386 from 00ce357344bff8e3c0ce96a5ee8179d19e2c8886 to 24Q4-release (f4545d30) · Commits · e / os / android_packages_modules_Bluetooth

android/app/aidl/android/bluetooth/IBluetooth.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -225,8 +225,8 @@ interface IBluetooth
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")
		oneway void requestActivityInfo(in IBluetoothActivityEnergyInfoListener listener, in AttributionSource attributionSource);

		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")
		oneway void startBrEdr(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")
		oneway void bleOnToOn(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")
		oneway void bleOnToOff(in AttributionSource attributionSource);

android/app/aidl/android/bluetooth/IBluetoothHeadset.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ interface IBluetoothHeadset {
		List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		int getConnectionState(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.MODIFY_PHONE_STATE})")
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		boolean startVoiceRecognition(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		boolean stopVoiceRecognition(in BluetoothDevice device, in AttributionSource attributionSource);

android/app/src/com/android/bluetooth/Utils.java

+2 −107

Original line number	Diff line number	Diff line
		@@ -1323,114 +1323,9 @@ public final class Utils {
		}

		/**
		* Simple alternative to {@link String#format} which purposefully supports only a small handful
		* of substitutions to improve execution speed. Benchmarking reveals this optimized alternative
		* performs 6.5x faster for a typical format string.
		*
		* <p>Below is a summary of the limited grammar supported by this method; if you need advanced
		* features, please continue using {@link String#format}.
		*
		* <ul>
		* <li>{@code %b} for {@code boolean}
		* <li>{@code %c} for {@code char}
		* <li>{@code %d} for {@code int} or {@code long}
		* <li>{@code %f} for {@code float} or {@code double}
		* <li>{@code %s} for {@code String}
		* <li>{@code %x} for hex representation of {@code int} or {@code long} or {@code byte}
		* <li>{@code %%} for literal {@code %}
		* <li>{@code %04d} style grammar to specify the argument width, such as {@code %04d} to
		* prefix an {@code int} with zeros or {@code %10b} to prefix a {@code boolean} with
		* spaces
		* </ul>
		*
		* <p>(copied from framework/base/core/java/android/text/TextUtils.java)
		*
		* <p>See {@code android.text.TextUtils.formatSimple}
		*
		* @throws IllegalArgumentException if the format string or arguments don't match the supported
		* grammar described above.
		* @hide
		* @see android.bluetooth.BluetoothUtils.formatSimple
		*/
		public static @NonNull String formatSimple(@NonNull String format, Object... args) {
		final StringBuilder sb = new StringBuilder(format);
		int j = 0;
		for (int i = 0; i < sb.length(); ) {
		if (sb.charAt(i) == '%') {
		char code = sb.charAt(i + 1);

		// Decode any argument width request
		char prefixChar = '\0';
		int prefixLen = 0;
		int consume = 2;
		while ('0' <= code && code <= '9') {
		if (prefixChar == '\0') {
		prefixChar = (code == '0') ? '0' : ' ';
		}
		prefixLen *= 10;
		prefixLen += Character.digit(code, 10);
		consume += 1;
		code = sb.charAt(i + consume - 1);
		}

		final String repl;
		switch (code) {
		case 'b' -> {
		if (j == args.length) {
		throw new IllegalArgumentException("Too few arguments");
		}
		final Object arg = args[j++];
		if (arg instanceof Boolean) {
		repl = Boolean.toString((boolean) arg);
		} else {
		repl = Boolean.toString(arg != null);
		}
		}
		case 'c', 'd', 'f', 's' -> {
		if (j == args.length) {
		throw new IllegalArgumentException("Too few arguments");
		}
		final Object arg = args[j++];
		repl = String.valueOf(arg);
		}
		case 'x' -> {
		if (j == args.length) {
		throw new IllegalArgumentException("Too few arguments");
		}
		final Object arg = args[j++];
		if (arg instanceof Integer) {
		repl = Integer.toHexString((int) arg);
		} else if (arg instanceof Long) {
		repl = Long.toHexString((long) arg);
		} else if (arg instanceof Byte) {
		repl = Integer.toHexString(Byte.toUnsignedInt((byte) arg));
		} else {
		throw new IllegalArgumentException(
		"Unsupported hex type " + arg.getClass());
		}
		}
		case '%' -> {
		repl = "%";
		}
		default -> {
		throw new IllegalArgumentException("Unsupported format code " + code);
		}
		}

		sb.replace(i, i + consume, repl);

		// Apply any argument width request
		final int prefixInsert = (prefixChar == '0' && repl.charAt(0) == '-') ? 1 : 0;
		for (int k = repl.length(); k < prefixLen; k++) {
		sb.insert(i + prefixInsert, prefixChar);
		}
		i += Math.max(repl.length(), prefixLen);
		} else {
		i++;
		}
		}
		if (j != args.length) {
		throw new IllegalArgumentException("Too many arguments");
		}
		return sb.toString();
		return android.bluetooth.BluetoothUtils.formatSimple(format, args);
		}
		}

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -3807,17 +3807,16 @@ public class AdapterService extends Service {
		}

		@Override
		public void startBrEdr(AttributionSource source) {
		public void bleOnToOn(AttributionSource source) {
		AdapterService service = getService();
		if (service == null
		\|\| !callerIsSystemOrActiveOrManagedUser(service, TAG, "startBrEdr")
		\|\| !Utils.checkConnectPermissionForDataDelivery(service, source, TAG)) {
		\|\| !callerIsSystemOrActiveOrManagedUser(service, TAG, "bleOnToOn")) {
		return;
		}

		service.enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED, null);

		service.startBrEdr();
		service.bleOnToOn();
		}

		@Override
		@@ -5776,7 +5775,7 @@ public class AdapterService extends Service {
		}

		@VisibleForTesting
		void startBrEdr() {
		void bleOnToOn() {
		mAdapterStateMachine.sendMessage(AdapterState.USER_TURN_ON);
		}

android/app/src/com/android/bluetooth/hfp/HeadsetService.java

+5 −12

Original line number	Diff line number	Diff line
		@@ -635,7 +635,8 @@ public class HeadsetService extends ProfileService {
		return false;
		}

		service.enforceCallingOrSelfPermission(MODIFY_PHONE_STATE, null);
		requireNonNull(device);

		return service.startVoiceRecognition(device);
		}

		@@ -1106,10 +1107,6 @@ public class HeadsetService extends ProfileService {
		+ mActiveDevice);
		return false;
		}
		if (device == null) {
		Log.i(TAG, "device is null, use active device " + mActiveDevice + " instead");
		device = mActiveDevice;
		}
		boolean pendingRequestByHeadset = false;
		if (mVoiceRecognitionTimeoutEvent != null) {
		if (!mVoiceRecognitionTimeoutEvent.mVoiceRecognitionDevice.equals(device)) {
		@@ -1130,7 +1127,7 @@ public class HeadsetService extends ProfileService {
		}
		pendingRequestByHeadset = true;
		}
		if (!Objects.equals(device, mActiveDevice) && !setActiveDevice(device)) {
		if (!device.equals(mActiveDevice) && !setActiveDevice(device)) {
		Log.w(TAG, "startVoiceRecognition: failed to set " + device + " as active");
		return false;
		}
		@@ -1454,12 +1451,8 @@ public class HeadsetService extends ProfileService {
		+ previousActiveDevice
		+ " with status code "
		+ disconnectStatus);
		if (previousActiveDevice == null) {
		removeActiveDevice();
		} else {
		mActiveDevice = previousActiveDevice;
		mNativeInterface.setActiveDevice(previousActiveDevice);
		}
		return false;
		}
		if (Utils.isScoManagedByAudioEnabled()) {