Merge "Allow for internal types in @hide API" into tm-dev

This commit is contained in:
Nathalie Le Clair
2022-04-05 08:14:54 +00:00
committed by Android (Google) Code Review

View File

@@ -5898,14 +5898,8 @@ public class AudioManager {
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
@RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
public void setWiredDeviceConnectionState(int device, int state, String address, public void setWiredDeviceConnectionState(int device, int state, String address, String name) {
String name) { AudioDeviceAttributes attributes = new AudioDeviceAttributes(device, address, name);
final IAudioService service = getService();
int role = isOutputDevice(device)
? AudioDeviceAttributes.ROLE_OUTPUT : AudioDeviceAttributes.ROLE_INPUT;
AudioDeviceAttributes attributes = new AudioDeviceAttributes(
role, AudioDeviceInfo.convertInternalDeviceToDeviceType(device), address,
name, new ArrayList<>()/*mAudioProfiles*/, new ArrayList<>()/*mAudioDescriptors*/);
setWiredDeviceConnectionState(attributes, state); setWiredDeviceConnectionState(attributes, state);
} }