Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OboeTester: Add supported mixer attributes to device report #2169

Merged
merged 2 commits into from
Feb 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

import android.media.AudioDescriptor;
import android.media.AudioDeviceInfo;
import android.media.AudioManager;
import android.media.AudioMixerAttributes;
import android.media.AudioProfile;
import android.os.Build;

Expand All @@ -31,7 +33,7 @@ public class AudioDeviceInfoConverter {
* @param adi The AudioDeviceInfo object to be converted to a String
* @return String containing all the information from the AudioDeviceInfo object
*/
public static String toString(AudioDeviceInfo adi){
public static String toString(AudioManager audioManager, AudioDeviceInfo adi){

StringBuilder sb = new StringBuilder();
sb.append("Id: ");
Expand Down Expand Up @@ -74,30 +76,37 @@ public static String toString(AudioDeviceInfo adi){
sb.append(adi.getAddress());
}

if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
sb.append("\nEncapsulation Metadata Types: ");
int[] encapsulationMetadataTypes = adi.getEncapsulationMetadataTypes();
sb.append(intArrayToString(encapsulationMetadataTypes));
}

if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
sb.append("\nEncapsulation Modes: ");
int[] encapsulationModes = adi.getEncapsulationModes();
sb.append(intArrayToString(encapsulationModes));
}

if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
sb.append("\nAudio Descriptors: ");
List<AudioDescriptor> audioDescriptors = adi.getAudioDescriptors();
sb.append(audioDescriptors);
}

if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
sb.append("\nAudio Profiles: ");
List<AudioProfile> audioProfiles = adi.getAudioProfiles();
sb.append(audioProfiles);
}

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
sb.append("\nSupported Mixer Attributes: ");
List<AudioMixerAttributes> audioMixerAttributes =
audioManager.getSupportedMixerAttributes(adi);
sb.append(audioMixerAttributes);
}

sb.append("\n");
return sb.toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ private void reportDeviceInfo(Collection<AudioDeviceInfo> devices) {

for (AudioDeviceInfo deviceInfo : devices) {
report.append("\n==== Device =================== " + deviceInfo.getId() + "\n");
String item = AudioDeviceInfoConverter.toString(deviceInfo);
String item = AudioDeviceInfoConverter.toString(mAudioManager, deviceInfo);
report.append(item);
}
report.append(reportAllMicrophones());
Expand Down