Snap for 12147630 from f1407f495ffd5bae7370a2368ed2b0f6b64bf478 to 24Q4-release (9f872792) · Commits · e / os / android_packages_modules_Bluetooth

android/app/aidl/android/bluetooth/IBluetoothMapClient.aidl

+0 −8

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ interface IBluetoothMapClient {
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf = { android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED })")
		boolean disconnect(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		boolean isConnected(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		List<BluetoothDevice> getConnectedDevices(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states, in AttributionSource attributionSource);
		@@ -45,10 +43,4 @@ interface IBluetoothMapClient {
		int getConnectionPolicy(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf = { android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.SEND_SMS })")
		boolean sendMessage(in BluetoothDevice device, in Uri[] contacts, in String message, in PendingIntent sentIntent, in PendingIntent deliveryIntent, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf = { android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.READ_SMS })")
		boolean getUnreadMessages(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		int getSupportedFeatures(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf = { android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.READ_SMS })")
		boolean setMessageStatus(in BluetoothDevice device, in String handle, in int status, in AttributionSource attributionSource);
		}

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -885,7 +885,7 @@ public class A2dpService extends ProfileService {
		* BluetoothA2dp#DYNAMIC_BUFFER_SUPPORT_A2DP_OFFLOAD}, {@link
		* BluetoothA2dp#DYNAMIC_BUFFER_SUPPORT_A2DP_SOFTWARE_ENCODING}.
		*/
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		@RequiresPermission(BLUETOOTH_PRIVILEGED)
		public int getDynamicBufferSupport() {
		enforceCallingOrSelfPermission(
		BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
		@@ -897,7 +897,7 @@ public class A2dpService extends ProfileService {
		*
		* @return BufferConstraints
		*/
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		@RequiresPermission(BLUETOOTH_PRIVILEGED)
		public BufferConstraints getBufferConstraints() {
		enforceCallingOrSelfPermission(
		BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
		@@ -911,7 +911,7 @@ public class A2dpService extends ProfileService {
		* @param value buffer millis
		* @return true if the settings is successful, false otherwise
		*/
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		@RequiresPermission(BLUETOOTH_PRIVILEGED)
		public boolean setBufferLengthMillis(int codec, int value) {
		enforceCallingOrSelfPermission(
		BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/
		package com.android.bluetooth.a2dpsink;

		import static android.Manifest.permission.BLUETOOTH_CONNECT;
		import static android.Manifest.permission.BLUETOOTH_PRIVILEGED;

		import static java.util.Objects.requireNonNull;
		@@ -176,7 +177,7 @@ public class A2dpSinkService extends ProfileService {
		}
		}

		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		@RequiresPermission(BLUETOOTH_PRIVILEGED)
		boolean isA2dpPlaying(BluetoothDevice device) {
		enforceCallingOrSelfPermission(
		BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
		@@ -206,7 +207,7 @@ public class A2dpSinkService extends ProfileService {
		mService = null;
		}

		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		@RequiresPermission(BLUETOOTH_CONNECT)
		private A2dpSinkService getService(AttributionSource source) {
		// Cache mService because it can change while getService is called
		A2dpSinkService service = mService;

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java

+2 −1

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

		import static android.Manifest.permission.BLUETOOTH_CONNECT;
		import static android.Manifest.permission.BLUETOOTH_PRIVILEGED;

		import android.annotation.RequiresPermission;
		import android.bluetooth.BluetoothA2dpSink;
		@@ -176,7 +177,7 @@ class A2dpSinkStateMachine extends StateMachine {
		return false;
		}

		@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
		@RequiresPermission(BLUETOOTH_PRIVILEGED)
		void processStackEvent(StackEvent event) {
		switch (event.mType) {
		case StackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:

android/app/src/com/android/bluetooth/audio_util/helpers/Metadata.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,8 @@ public class Metadata implements Cloneable {
		+ artist
		+ "\" album=\""
		+ album
		+ "\" genre=\""
		+ genre
		+ "\" duration="
		+ duration
		+ " trackPosition="