Merge "Remove leaudio_broadcast_volume_control_for_connected_devices flag" into main (a0556794) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/vc/VolumeControlService.java

+47 −59

Original line number	Original line	Diff line number	Diff line
	@@ -469,9 +469,6 @@ public class VolumeControlService extends ProfileService {
	}		}

	void setDeviceVolume(BluetoothDevice device, int volume, boolean isGroupOp) {		void setDeviceVolume(BluetoothDevice device, int volume, boolean isGroupOp) {
	if (!Flags.leaudioBroadcastVolumeControlForConnectedDevices()) {
	return;
	}
	Log.d(		Log.d(
	TAG,		TAG,
	"setDeviceVolume: " + device + ", volume: " + volume + ", isGroupOp: " + isGroupOp);		"setDeviceVolume: " + device + ", volume: " + volume + ", isGroupOp: " + isGroupOp);
	@@ -632,7 +629,6 @@ public class VolumeControlService extends ProfileService {
	}		}
	}		}

	if (Flags.leaudioBroadcastVolumeControlForConnectedDevices()) {
	// using tempCallbackList is a hack to keep using 'notifyDevicesVolumeChanged'		// using tempCallbackList is a hack to keep using 'notifyDevicesVolumeChanged'
	// without making any extra modification		// without making any extra modification
	RemoteCallbackList<IBluetoothVolumeControlCallback> tempCallbackList =		RemoteCallbackList<IBluetoothVolumeControlCallback> tempCallbackList =
	@@ -642,7 +638,6 @@ public class VolumeControlService extends ProfileService {
	notifyDevicesVolumeChanged(tempCallbackList, getDevices(), Optional.empty());		notifyDevicesVolumeChanged(tempCallbackList, getDevices(), Optional.empty());
	tempCallbackList.unregister(callback);		tempCallbackList.unregister(callback);
	}		}
	}

	void registerCallback(IBluetoothVolumeControlCallback callback) {		void registerCallback(IBluetoothVolumeControlCallback callback) {
	Log.d(TAG, "registerCallback: " + callback);		Log.d(TAG, "registerCallback: " + callback);
	@@ -724,7 +719,6 @@ public class VolumeControlService extends ProfileService {
	mGroupVolumeCache.put(groupId, volume);		mGroupVolumeCache.put(groupId, volume);
	mGroupMuteCache.put(groupId, mute);		mGroupMuteCache.put(groupId, mute);

	if (Flags.leaudioBroadcastVolumeControlForConnectedDevices()) {
	LeAudioService leAudioService = mFactory.getLeAudioService();		LeAudioService leAudioService = mFactory.getLeAudioService();
	if (leAudioService != null) {		if (leAudioService != null) {
	int currentlyActiveGroupId = leAudioService.getActiveGroupId();		int currentlyActiveGroupId = leAudioService.getActiveGroupId();
	@@ -742,9 +736,7 @@ public class VolumeControlService extends ProfileService {
	\|\| bassClientService.getSyncedBroadcastSinks().stream()		\|\| bassClientService.getSyncedBroadcastSinks().stream()
	.map(dev -> leAudioService.getGroupId(dev))		.map(dev -> leAudioService.getGroupId(dev))
	.noneMatch(		.noneMatch(
	id ->		id -> id == groupId && leAudioService.isPrimaryGroup(id))) {
	id == groupId
	&& leAudioService.isPrimaryGroup(id))) {
	Log.i(		Log.i(
	TAG,		TAG,
	"Skip updating to audio system if not updating volume for current"		"Skip updating to audio system if not updating volume for current"
	@@ -755,7 +747,6 @@ public class VolumeControlService extends ProfileService {
	} else {		} else {
	Log.w(TAG, "leAudioService not available");		Log.w(TAG, "leAudioService not available");
	}		}
	}

	int streamType = getBluetoothContextualVolumeStream();		int streamType = getBluetoothContextualVolumeStream();
	int flags = AudioManager.FLAG_BLUETOOTH_ABS_VOLUME;		int flags = AudioManager.FLAG_BLUETOOTH_ABS_VOLUME;
	@@ -835,7 +826,6 @@ public class VolumeControlService extends ProfileService {
	return;		return;
	}		}

	if (Flags.leaudioBroadcastVolumeControlForConnectedDevices()) {
	Log.i(TAG, "handleVolumeControlChanged: " + device + "; volume: " + volume);		Log.i(TAG, "handleVolumeControlChanged: " + device + "; volume: " + volume);
	if (device == null) {		if (device == null) {
	// notify group devices volume changed		// notify group devices volume changed
	@@ -853,9 +843,7 @@ public class VolumeControlService extends ProfileService {
	} else {		} else {
	// notify device volume changed		// notify device volume changed
	synchronized (mCallbacks) {		synchronized (mCallbacks) {
	notifyDevicesVolumeChanged(		notifyDevicesVolumeChanged(mCallbacks, Arrays.asList(device), Optional.of(volume));
	mCallbacks, Arrays.asList(device), Optional.of(volume));
	}
	}		}
	}		}

android/app/tests/unit/src/com/android/bluetooth/vc/VolumeControlServiceTest.java

+15 −33

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,7 @@ public class VolumeControlServiceTest {
	private static final int MEDIA_MAX_VOL = 25;		private static final int MEDIA_MAX_VOL = 25;
	private static final int CALL_MIN_VOL = 1;		private static final int CALL_MIN_VOL = 1;
	private static final int CALL_MAX_VOL = 8;		private static final int CALL_MAX_VOL = 8;
			private static final int TEST_GROUP_ID = 1;

	private BroadcastReceiver mVolumeControlIntentReceiver;		private BroadcastReceiver mVolumeControlIntentReceiver;

	@@ -570,7 +571,7 @@ public class VolumeControlServiceTest {
	new VolumeControlStackEvent(		new VolumeControlStackEvent(
	VolumeControlStackEvent.EVENT_TYPE_VOLUME_STATE_CHANGED);		VolumeControlStackEvent.EVENT_TYPE_VOLUME_STATE_CHANGED);
	stackEvent.device = null;		stackEvent.device = null;
	stackEvent.valueInt1 = 1; // groupId		stackEvent.valueInt1 = TEST_GROUP_ID; // groupId
	stackEvent.valueBool1 = false; // isMuted		stackEvent.valueBool1 = false; // isMuted
	stackEvent.valueBool2 = true; // isAutonomous		stackEvent.valueBool2 = true; // isAutonomous

	@@ -591,10 +592,9 @@ public class VolumeControlServiceTest {

	@Test		@Test
	public void testAutonomousVolumeStateChange() {		public void testAutonomousVolumeStateChange() {
	// TODO: b/329163385 - This test should be modified to run without having to set the flag to		// Make device Active now. This will trigger setting volume to AF
	// a specific value		when(mLeAudioService.getActiveGroupId()).thenReturn(TEST_GROUP_ID);
	mSetFlagsRule.disableFlags(
	Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_FOR_CONNECTED_DEVICES);
	doReturn(AudioManager.MODE_IN_CALL).when(mAudioManager).getMode();		doReturn(AudioManager.MODE_IN_CALL).when(mAudioManager).getMode();
	testVolumeCalculations(AudioManager.STREAM_VOICE_CALL, CALL_MIN_VOL, CALL_MAX_VOL);		testVolumeCalculations(AudioManager.STREAM_VOICE_CALL, CALL_MIN_VOL, CALL_MAX_VOL);

	@@ -605,25 +605,23 @@ public class VolumeControlServiceTest {
	/** Test if autonomous Mute/Unmute propagates the event to audio manager. */		/** Test if autonomous Mute/Unmute propagates the event to audio manager. */
	@Test		@Test
	public void testAutonomousMuteUnmute() {		public void testAutonomousMuteUnmute() {
	// TODO: b/329163385 - This test should be modified to run without having to set the flag to
	// a specific value
	mSetFlagsRule.disableFlags(
	Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_FOR_CONNECTED_DEVICES);
	int streamType = AudioManager.STREAM_MUSIC;		int streamType = AudioManager.STREAM_MUSIC;
	int streamVol = getLeAudioVolume(19, MEDIA_MIN_VOL, MEDIA_MAX_VOL, streamType);		int streamVol = getLeAudioVolume(19, MEDIA_MIN_VOL, MEDIA_MAX_VOL, streamType);

	doReturn(false).when(mAudioManager).isStreamMute(eq(AudioManager.STREAM_MUSIC));		doReturn(false).when(mAudioManager).isStreamMute(eq(AudioManager.STREAM_MUSIC));

	// Verify that muting LeAudio device, sets the mute state on the audio device		// Verify that muting LeAudio device, sets the mute state on the audio device
			// Make device Active now. This will trigger setting volume to AF
			when(mLeAudioService.getActiveGroupId()).thenReturn(TEST_GROUP_ID);

	generateVolumeStateChanged(null, 1, streamVol, 0, true, true);		generateVolumeStateChanged(null, TEST_GROUP_ID, streamVol, 0, true, true);
	verify(mAudioManager)		verify(mAudioManager)
	.adjustStreamVolume(eq(streamType), eq(AudioManager.ADJUST_MUTE), anyInt());		.adjustStreamVolume(eq(streamType), eq(AudioManager.ADJUST_MUTE), anyInt());

	doReturn(true).when(mAudioManager).isStreamMute(eq(AudioManager.STREAM_MUSIC));		doReturn(true).when(mAudioManager).isStreamMute(eq(AudioManager.STREAM_MUSIC));

	// Verify that unmuting LeAudio device, unsets the mute state on the audio device		// Verify that unmuting LeAudio device, unsets the mute state on the audio device
	generateVolumeStateChanged(null, 1, streamVol, 0, false, true);		generateVolumeStateChanged(null, TEST_GROUP_ID, streamVol, 0, false, true);
	verify(mAudioManager)		verify(mAudioManager)
	.adjustStreamVolume(eq(streamType), eq(AudioManager.ADJUST_UNMUTE), anyInt());		.adjustStreamVolume(eq(streamType), eq(AudioManager.ADJUST_UNMUTE), anyInt());
	}		}
	@@ -650,10 +648,6 @@ public class VolumeControlServiceTest {
	/** Test Active Group change */		/** Test Active Group change */
	@Test		@Test
	public void testActiveGroupChange() throws Exception {		public void testActiveGroupChange() throws Exception {
	// TODO: b/329163385 - This test should be modified to run without having to set the flag to
	// a specific value
	mSetFlagsRule.disableFlags(
	Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_FOR_CONNECTED_DEVICES);
	int groupId_1 = 1;		int groupId_1 = 1;
	int volume_groupId_1 = 6;		int volume_groupId_1 = 6;

	@@ -666,6 +660,8 @@ public class VolumeControlServiceTest {

	mServiceBinder.setGroupVolume(groupId_2, volume_groupId_2, mAttributionSource);		mServiceBinder.setGroupVolume(groupId_2, volume_groupId_2, mAttributionSource);

			// Make device Active now. This will trigger setting volume to AF
			when(mLeAudioService.getActiveGroupId()).thenReturn(groupId_1);
	mServiceBinder.setGroupActive(groupId_1, true, mAttributionSource);		mServiceBinder.setGroupActive(groupId_1, true, mAttributionSource);

	// Expected index for STREAM_MUSIC		// Expected index for STREAM_MUSIC
	@@ -673,6 +669,8 @@ public class VolumeControlServiceTest {
	(int) Math.round((double) (volume_groupId_1 * MEDIA_MAX_VOL) / BT_LE_AUDIO_MAX_VOL);		(int) Math.round((double) (volume_groupId_1 * MEDIA_MAX_VOL) / BT_LE_AUDIO_MAX_VOL);
	verify(mAudioManager).setStreamVolume(anyInt(), eq(expectedVol), anyInt());		verify(mAudioManager).setStreamVolume(anyInt(), eq(expectedVol), anyInt());

			// Make device Active now. This will trigger setting volume to AF
			when(mLeAudioService.getActiveGroupId()).thenReturn(groupId_2);
	mServiceBinder.setGroupActive(groupId_2, true, mAttributionSource);		mServiceBinder.setGroupActive(groupId_2, true, mAttributionSource);

	expectedVol =		expectedVol =
	@@ -751,10 +749,7 @@ public class VolumeControlServiceTest {

	/** Test if phone will set volume which is read from the buds */		/** Test if phone will set volume which is read from the buds */
	@Test		@Test
	@EnableFlags({		@EnableFlags(Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_PRIMARY_GROUP_ONLY)
	Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_FOR_CONNECTED_DEVICES,
	Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_PRIMARY_GROUP_ONLY
	})
	public void testConnectedDeviceWithUserPersistFlagSet() throws Exception {		public void testConnectedDeviceWithUserPersistFlagSet() throws Exception {
	int groupId = 1;		int groupId = 1;
	int volumeDevice = 56;		int volumeDevice = 56;
	@@ -1118,9 +1113,6 @@ public class VolumeControlServiceTest {

	@Test		@Test
	public void testServiceBinderSetDeviceVolumeMethods() throws Exception {		public void testServiceBinderSetDeviceVolumeMethods() throws Exception {
	mSetFlagsRule.enableFlags(
	Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_FOR_CONNECTED_DEVICES);

	int groupId = 1;		int groupId = 1;
	int groupVolume = 56;		int groupVolume = 56;
	int deviceOneVolume = 46;		int deviceOneVolume = 46;
	@@ -1269,8 +1261,6 @@ public class VolumeControlServiceTest {
	@Test		@Test
	public void testServiceBinderRegisterVolumeChangedCallbackWhenDeviceAlreadyConnected()		public void testServiceBinderRegisterVolumeChangedCallbackWhenDeviceAlreadyConnected()
	throws Exception {		throws Exception {
	mSetFlagsRule.enableFlags(
	Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_FOR_CONNECTED_DEVICES);
	int groupId = 1;		int groupId = 1;
	int deviceOneVolume = 46;		int deviceOneVolume = 46;
	int deviceTwoVolume = 36;		int deviceTwoVolume = 36;
	@@ -1323,8 +1313,6 @@ public class VolumeControlServiceTest {

	@Test		@Test
	public void testServiceBinderTestNotifyNewRegisteredCallback() throws Exception {		public void testServiceBinderTestNotifyNewRegisteredCallback() throws Exception {
	mSetFlagsRule.enableFlags(
	Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_FOR_CONNECTED_DEVICES);
	int groupId = 1;		int groupId = 1;
	int deviceOneVolume = 46;		int deviceOneVolume = 46;
	int deviceTwoVolume = 36;		int deviceTwoVolume = 36;
	@@ -1418,9 +1406,6 @@ public class VolumeControlServiceTest {
	/** Test Volume Control changed callback. */		/** Test Volume Control changed callback. */
	@Test		@Test
	public void testVolumeControlChangedCallback() throws Exception {		public void testVolumeControlChangedCallback() throws Exception {
	mSetFlagsRule.enableFlags(
	Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_FOR_CONNECTED_DEVICES);

	int groupId = 1;		int groupId = 1;
	int groupVolume = 56;		int groupVolume = 56;
	int deviceOneVolume = 46;		int deviceOneVolume = 46;
	@@ -1465,10 +1450,7 @@ public class VolumeControlServiceTest {

	/** Test Volume Control changed for broadcast primary group. */		/** Test Volume Control changed for broadcast primary group. */
	@Test		@Test
	@EnableFlags({		@EnableFlags(Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_PRIMARY_GROUP_ONLY)
	Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_FOR_CONNECTED_DEVICES,
	Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_PRIMARY_GROUP_ONLY
	})
	public void testVolumeControlChangedForBroadcastPrimaryGroup() throws Exception {		public void testVolumeControlChangedForBroadcastPrimaryGroup() throws Exception {
	int groupId = 1;		int groupId = 1;
	int groupVolume = 30;		int groupVolume = 30;

framework/api/system-current.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1124,7 +1124,7 @@ package android.bluetooth {
	method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean isVolumeOffsetAvailable(@NonNull android.bluetooth.BluetoothDevice);		method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean isVolumeOffsetAvailable(@NonNull android.bluetooth.BluetoothDevice);
	method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothVolumeControl.Callback);		method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothVolumeControl.Callback);
	method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);		method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);
	method @FlaggedApi("com.android.bluetooth.flags.leaudio_broadcast_volume_control_for_connected_devices") @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void setDeviceVolume(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=0, to=255) int, boolean);		method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void setDeviceVolume(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=0, to=255) int, boolean);
	method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void setVolumeOffset(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=0xffffff01, to=255) int);		method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void setVolumeOffset(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=0xffffff01, to=255) int);
	method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void setVolumeOffset(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=1, to=255) int, @IntRange(from=0xffffff01, to=255) int);		method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void setVolumeOffset(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=1, to=255) int, @IntRange(from=0xffffff01, to=255) int);
	method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void unregisterCallback(@NonNull android.bluetooth.BluetoothVolumeControl.Callback);		method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void unregisterCallback(@NonNull android.bluetooth.BluetoothVolumeControl.Callback);
	@@ -1132,7 +1132,7 @@ package android.bluetooth {
	}		}

	public static interface BluetoothVolumeControl.Callback {		public static interface BluetoothVolumeControl.Callback {
	method @FlaggedApi("com.android.bluetooth.flags.leaudio_broadcast_volume_control_for_connected_devices") public default void onDeviceVolumeChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=0, to=255) int);		method public default void onDeviceVolumeChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=0, to=255) int);
	method public default void onVolumeOffsetAudioDescriptionChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=1, to=255) int, @NonNull String);		method public default void onVolumeOffsetAudioDescriptionChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=1, to=255) int, @NonNull String);
	method public default void onVolumeOffsetAudioLocationChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=1, to=255) int, @IntRange(from=0xffffff01, to=255) int);		method public default void onVolumeOffsetAudioLocationChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=1, to=255) int, @IntRange(from=0xffffff01, to=255) int);
	method @Deprecated public default void onVolumeOffsetChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=0xffffff01, to=255) int);		method @Deprecated public default void onVolumeOffsetChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=0xffffff01, to=255) int);

framework/java/android/bluetooth/BluetoothVolumeControl.java

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,6 @@ import static android.bluetooth.BluetoothUtils.executeFromBinder;
	import static java.util.Objects.requireNonNull;		import static java.util.Objects.requireNonNull;

	import android.annotation.CallbackExecutor;		import android.annotation.CallbackExecutor;
	import android.annotation.FlaggedApi;
	import android.annotation.IntRange;		import android.annotation.IntRange;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	@@ -42,7 +41,6 @@ import android.os.RemoteException;
	import android.util.CloseGuard;		import android.util.CloseGuard;
	import android.util.Log;		import android.util.Log;

	import com.android.bluetooth.flags.Flags;
	import com.android.internal.annotations.GuardedBy;		import com.android.internal.annotations.GuardedBy;

	import java.util.Collections;		import java.util.Collections;
	@@ -158,7 +156,6 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose
	* @param volume level		* @param volume level
	* @hide		* @hide
	*/		*/
	@FlaggedApi(Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_FOR_CONNECTED_DEVICES)
	@SystemApi		@SystemApi
	default void onDeviceVolumeChanged(		default void onDeviceVolumeChanged(
	@NonNull BluetoothDevice device, @IntRange(from = 0, to = 255) int volume) {}		@NonNull BluetoothDevice device, @IntRange(from = 0, to = 255) int volume) {}
	@@ -725,7 +722,6 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose
	* @throws IllegalArgumentException if volume is not in the range [0, 255].		* @throws IllegalArgumentException if volume is not in the range [0, 255].
	* @hide		* @hide
	*/		*/
	@FlaggedApi(Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_FOR_CONNECTED_DEVICES)
	@SystemApi		@SystemApi
	@RequiresBluetoothConnectPermission		@RequiresBluetoothConnectPermission
	@RequiresPermission(allOf = {BLUETOOTH_CONNECT, BLUETOOTH_PRIVILEGED})		@RequiresPermission(allOf = {BLUETOOTH_CONNECT, BLUETOOTH_PRIVILEGED})

framework/lint-baseline.xml

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -56,17 +56,6 @@
	column="18"/>		column="18"/>
	</issue>		</issue>

	<issue
	id="FlaggedApi"
	message="Method `onDeviceVolumeChanged()` is a flagged API and should be inside an `if (Flags.leaudioBroadcastVolumeControlForConnectedDevices())` check (or annotate the surrounding method `onDeviceVolumeChanged` with `@FlaggedApi(Flags.FLAG_LEAUDIO_BROADCAST_VOLUME_CONTROL_FOR_CONNECTED_DEVICES) to transfer requirement to caller`)"
	errorLine1=" forEach((cb) -> cb.onDeviceVolumeChanged(device, volume));"
	errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
	<location
	file="packages/modules/Bluetooth/framework/java/android/bluetooth/BluetoothVolumeControl.java"
	line="215"
	column="29"/>
	</issue>

	<issue		<issue
	id="FlaggedApi"		id="FlaggedApi"
	message="Field `DISTANCE_MEASUREMENT_METHOD_CHANNEL_SOUNDING` is a flagged API and should be inside an `if (Flags.channelSounding())` check (or annotate the surrounding method `Builder` with `@FlaggedApi(Flags.FLAG_CHANNEL_SOUNDING) to transfer requirement to caller`)"		message="Field `DISTANCE_MEASUREMENT_METHOD_CHANNEL_SOUNDING` is a flagged API and should be inside an `if (Flags.channelSounding())` check (or annotate the surrounding method `Builder` with `@FlaggedApi(Flags.FLAG_CHANNEL_SOUNDING) to transfer requirement to caller`)"