Merge changes from topics "AudioDeviceAttributes_update", "ShortAudioDescriptors" (dbad339f) · Commits · e / os / android_frameworks_base

core/api/current.txt

+8 −2

Original line number	Diff line number	Diff line
		@@ -19679,10 +19679,13 @@ package android.media {
		method public android.media.AudioAttributes.Builder setUsage(int);
		}

		public class AudioDescriptor {
		public class AudioDescriptor implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public byte[] getDescriptor();
		method public int getEncapsulationType();
		method public int getStandard();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.media.AudioDescriptor> CREATOR;
		field public static final int STANDARD_EDID = 1; // 0x1
		field public static final int STANDARD_NONE = 0; // 0x0
		}
		@@ -20198,14 +20201,17 @@ package android.media {
		method @NonNull public android.media.AudioPresentation.Builder setProgramId(int);
		}

		public class AudioProfile {
		public class AudioProfile implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public int[] getChannelIndexMasks();
		method @NonNull public int[] getChannelMasks();
		method public int getEncapsulationType();
		method public int getFormat();
		method @NonNull public int[] getSampleRates();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int AUDIO_ENCAPSULATION_TYPE_IEC61937 = 1; // 0x1
		field public static final int AUDIO_ENCAPSULATION_TYPE_NONE = 0; // 0x0
		field @NonNull public static final android.os.Parcelable.Creator<android.media.AudioProfile> CREATOR;
		}

		public class AudioRecord implements android.media.AudioRecordingMonitor android.media.AudioRouting android.media.MicrophoneDirection {

core/api/system-current.txt

+13 −0

Original line number	Diff line number	Diff line
		@@ -5933,11 +5933,20 @@ package android.media {
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public android.media.AudioAttributes.Builder setSystemUsage(int);
		}

		public class AudioDescriptor implements android.os.Parcelable {
		ctor public AudioDescriptor(int, int, @NonNull byte[]);
		}

		public final class AudioDeviceAttributes implements android.os.Parcelable {
		ctor public AudioDeviceAttributes(@NonNull android.media.AudioDeviceInfo);
		ctor public AudioDeviceAttributes(int, int, @NonNull String);
		ctor public AudioDeviceAttributes(int, int, @NonNull String, @NonNull String, @NonNull java.util.List<android.media.AudioProfile>, @NonNull java.util.List<android.media.AudioDescriptor>);
		method public int describeContents();
		method public boolean equalTypeAddress(@Nullable Object);
		method @NonNull public String getAddress();
		method @NonNull public java.util.List<android.media.AudioDescriptor> getAudioDescriptors();
		method @NonNull public java.util.List<android.media.AudioProfile> getAudioProfiles();
		method @NonNull public String getName();
		method public int getRole();
		method public int getType();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		@@ -6094,6 +6103,10 @@ package android.media {
		field public static final int PLAYER_TYPE_UNKNOWN = -1; // 0xffffffff
		}

		public class AudioProfile implements android.os.Parcelable {
		ctor public AudioProfile(int, @NonNull int[], @NonNull int[], @NonNull int[], int);
		}

		public class AudioRecord implements android.media.AudioRecordingMonitor android.media.AudioRouting android.media.MicrophoneDirection {
		ctor @RequiresPermission(android.Manifest.permission.RECORD_AUDIO) public AudioRecord(android.media.AudioAttributes, android.media.AudioFormat, int, int) throws java.lang.IllegalArgumentException;
		method public static long getMaxSharedAudioHistoryMillis();

core/jni/android_media_AudioSystem.cpp

+30 −21

Original line number	Diff line number	Diff line
		@@ -18,25 +18,25 @@
		//#define LOG_NDEBUG 0

		#define LOG_TAG "AudioSystem-JNI"
		#include <utils/Log.h>

		#include <sstream>
		#include <vector>
		#include <jni.h>
		#include <nativehelper/JNIHelp.h>
		#include "core_jni_helpers.h"

		#include <android/media/AudioVibratorInfo.h>
		#include <android/media/INativeSpatializerCallback.h>
		#include <android/media/ISpatializer.h>
		#include <android_os_Parcel.h>
		#include <audiomanager/AudioManager.h>
		#include <jni.h>
		#include <media/AudioContainers.h>
		#include <media/AudioPolicy.h>
		#include <media/AudioSystem.h>
		#include <media/MicrophoneInfo.h>
		#include <nativehelper/JNIHelp.h>
		#include <nativehelper/ScopedLocalRef.h>
		#include <system/audio.h>
		#include <system/audio_policy.h>
		#include <utils/Log.h>

		#include <sstream>
		#include <vector>

		#include "android_media_AudioAttributes.h"
		#include "android_media_AudioDescriptor.h"
		#include "android_media_AudioDeviceAttributes.h"
		@@ -46,6 +46,7 @@
		#include "android_media_AudioProfile.h"
		#include "android_media_MicrophoneInfo.h"
		#include "android_util_Binder.h"
		#include "core_jni_helpers.h"

		// ----------------------------------------------------------------------------

		@@ -584,18 +585,26 @@ android_media_AudioSystem_routing_callback()
		env->DeleteLocalRef(clazz);
		}

		static jint
		android_media_AudioSystem_setDeviceConnectionState(JNIEnv *env, jobject thiz, jint device, jint state, jstring device_address, jstring device_name,
		jint codec)
		{
		const char *c_address = env->GetStringUTFChars(device_address, NULL);
		const char *c_name = env->GetStringUTFChars(device_name, NULL);
		int status = check_AudioSystem_Command(AudioSystem::setDeviceConnectionState(static_cast <audio_devices_t>(device),
		static_cast <audio_policy_dev_state_t>(state),
		c_address, c_name,
		static jint android_media_AudioSystem_setDeviceConnectionState(JNIEnv *env, jobject thiz,
		jint state, jobject jParcel,
		jint codec) {
		int status;
		if (Parcel *parcel = parcelForJavaObject(env, jParcel); parcel != nullptr) {
		android::media::audio::common::AudioPort port{};
		if (status_t statusOfParcel = port.readFromParcel(parcel); statusOfParcel == OK) {
		status = check_AudioSystem_Command(
		AudioSystem::setDeviceConnectionState(static_cast<audio_policy_dev_state_t>(
		state),
		port,
		static_cast<audio_format_t>(codec)));
		env->ReleaseStringUTFChars(device_address, c_address);
		env->ReleaseStringUTFChars(device_name, c_name);
		} else {
		ALOGE("Failed to read from parcel: %s", statusToString(statusOfParcel).c_str());
		status = kAudioStatusError;
		}
		} else {
		ALOGE("Failed to retrieve the native parcel from Java parcel");
		status = kAudioStatusError;
		}
		return (jint) status;
		}

		@@ -2912,7 +2921,7 @@ static const JNINativeMethod gMethods[] =
		{"newAudioSessionId", "()I", (void *)android_media_AudioSystem_newAudioSessionId},
		{"newAudioPlayerId", "()I", (void *)android_media_AudioSystem_newAudioPlayerId},
		{"newAudioRecorderId", "()I", (void *)android_media_AudioSystem_newAudioRecorderId},
		{"setDeviceConnectionState", "(IILjava/lang/String;Ljava/lang/String;I)I",
		{"setDeviceConnectionState", "(ILandroid/os/Parcel;I)I",
		(void *)android_media_AudioSystem_setDeviceConnectionState},
		{"getDeviceConnectionState", "(ILjava/lang/String;)I",
		(void *)android_media_AudioSystem_getDeviceConnectionState},

media/java/android/media/AudioDescriptor.java

+77 −2

Original line number	Diff line number	Diff line
		@@ -18,16 +18,21 @@ package android.media;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.Arrays;
		import java.util.Objects;

		/**
		* The AudioDescriptor contains the information to describe the audio playback/capture
		* capabilities. The capabilities are described by a byte array, which is defined by a
		* particular standard. This is used when the format is unrecognized to the platform.
		*/
		public class AudioDescriptor {
		public class AudioDescriptor implements Parcelable {
		/**
		* The audio standard is not specified.
		*/
		@@ -49,7 +54,15 @@ public class AudioDescriptor {
		private final byte[] mDescriptor;
		private final int mEncapsulationType;

		AudioDescriptor(int standard, int encapsulationType, @NonNull byte[] descriptor) {
		/**
		* @hide
		* Constructor from standard, encapsulation type and descriptor
		* @param standard the standard of the audio descriptor
		* @param encapsulationType the encapsulation type of the audio descriptor
		* @param descriptor the audio descriptor
		*/
		@SystemApi
		public AudioDescriptor(int standard, int encapsulationType, @NonNull byte[] descriptor) {
		mStandard = standard;
		mEncapsulationType = encapsulationType;
		mDescriptor = descriptor;
		@@ -87,4 +100,66 @@ public class AudioDescriptor {
		public @AudioProfile.EncapsulationType int getEncapsulationType() {
		return mEncapsulationType;
		}

		@Override
		public int hashCode() {
		return Objects.hash(mStandard, mEncapsulationType, Arrays.hashCode(mDescriptor));
		}

		@Override
		public boolean equals(Object o) {
		if (this == o) return true;
		if (o == null \|\| getClass() != o.getClass()) return false;

		AudioDescriptor that = (AudioDescriptor) o;
		return ((mStandard == that.mStandard)
		&& (mEncapsulationType == that.mEncapsulationType)
		&& (Arrays.equals(mDescriptor, that.mDescriptor)));
		}

		@Override
		public String toString() {
		StringBuilder sb = new StringBuilder("{");
		sb.append("standard=" + mStandard);
		sb.append(", encapsulation type=" + mEncapsulationType);
		if (mDescriptor != null && mDescriptor.length > 0) {
		sb.append(", descriptor=").append(Arrays.toString(mDescriptor));
		}
		sb.append("}");
		return sb.toString();
		}

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeInt(mStandard);
		dest.writeInt(mEncapsulationType);
		dest.writeByteArray(mDescriptor);
		}

		private AudioDescriptor(@NonNull Parcel in) {
		mStandard = in.readInt();
		mEncapsulationType = in.readInt();
		mDescriptor = in.createByteArray();
		}

		public static final @NonNull Parcelable.Creator<AudioDescriptor> CREATOR =
		new Parcelable.Creator<AudioDescriptor>() {
		/**
		* Rebuilds an AudioDescriptor previously stored with writeToParcel().
		* @param p Parcel object to read the AudioDescriptor from
		* @return a new AudioDescriptor created from the data in the parcel
		*/
		public AudioDescriptor createFromParcel(Parcel p) {
		return new AudioDescriptor(p);
		}

		public AudioDescriptor[] newArray(int size) {
		return new AudioDescriptor[size];
		}
		};
		}

media/java/android/media/AudioDeviceAttributes.java

+124 −7

Original line number	Diff line number	Diff line
		@@ -18,12 +18,16 @@ package android.media;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;
		import java.util.Objects;

		/**
		@@ -65,16 +69,27 @@ public final class AudioDeviceAttributes implements Parcelable {
		* The unique address of the device. Some devices don't have addresses, only an empty string.
		*/
		private final @NonNull String mAddress;

		/**
		* The non-unique name of the device. Some devices don't have names, only an empty string.
		* Should not be used as a unique identifier for a device.
		*/
		private final @NonNull String mName;
		/**
		* Is input or output device
		*/
		private final @Role int mRole;

		/**
		* The internal audio device type
		*/
		private final int mNativeType;
		/**
		* List of AudioProfiles supported by the device
		*/
		private final @NonNull List<AudioProfile> mAudioProfiles;
		/**
		* List of AudioDescriptors supported by the device
		*/
		private final @NonNull List<AudioDescriptor> mAudioDescriptors;

		/**
		* @hide
		@@ -88,7 +103,10 @@ public final class AudioDeviceAttributes implements Parcelable {
		mRole = deviceInfo.isSink() ? ROLE_OUTPUT : ROLE_INPUT;
		mType = deviceInfo.getType();
		mAddress = deviceInfo.getAddress();
		mName = String.valueOf(deviceInfo.getProductName());
		mNativeType = deviceInfo.getInternalType();
		mAudioProfiles = deviceInfo.getAudioProfiles();
		mAudioDescriptors = deviceInfo.getAudioDescriptors();
		}

		/**
		@@ -101,6 +119,23 @@ public final class AudioDeviceAttributes implements Parcelable {
		@SystemApi
		public AudioDeviceAttributes(@Role int role, @AudioDeviceInfo.AudioDeviceType int type,
		@NonNull String address) {
		this(role, type, address, "", new ArrayList<>(), new ArrayList<>());
		}

		/**
		* @hide
		* Constructor with specification of all attributes
		* @param role indicates input or output role
		* @param type the device type, as defined in {@link AudioDeviceInfo}
		* @param address the address of the device, or an empty string for devices without one
		* @param name the name of the device, or an empty string for devices without one
		* @param profiles the list of AudioProfiles supported by the device
		* @param descriptors the list of AudioDescriptors supported by the device
		*/
		@SystemApi
		public AudioDeviceAttributes(@Role int role, @AudioDeviceInfo.AudioDeviceType int type,
		@NonNull String address, @NonNull String name, @NonNull List<AudioProfile> profiles,
		@NonNull List<AudioDescriptor> descriptors) {
		Objects.requireNonNull(address);
		if (role != ROLE_OUTPUT && role != ROLE_INPUT) {
		throw new IllegalArgumentException("Invalid role " + role);
		@@ -118,19 +153,37 @@ public final class AudioDeviceAttributes implements Parcelable {
		mRole = role;
		mType = type;
		mAddress = address;
		mName = name;
		mAudioProfiles = profiles;
		mAudioDescriptors = descriptors;
		}

		/**
		* @hide
		* Constructor from internal device type and address
		* @param type the internal device type, as defined in {@link AudioSystem}
		* Constructor called from AudioSystem JNI when creating an AudioDeviceAttributes from a native
		* AudioDeviceTypeAddr instance.
		* @param nativeType the internal device type, as defined in {@link AudioSystem}
		* @param address the address of the device, or an empty string for devices without one
		*/
		public AudioDeviceAttributes(int nativeType, @NonNull String address) {
		this(nativeType, address, "");
		}

		/**
		* @hide
		* Constructor called from BtHelper to connect or disconnect a Bluetooth device.
		* @param nativeType the internal device type, as defined in {@link AudioSystem}
		* @param address the address of the device, or an empty string for devices without one
		* @param name the name of the device, or an empty string for devices without one
		*/
		public AudioDeviceAttributes(int nativeType, @NonNull String address, @NonNull String name) {
		mRole = (nativeType & AudioSystem.DEVICE_BIT_IN) != 0 ? ROLE_INPUT : ROLE_OUTPUT;
		mType = AudioDeviceInfo.convertInternalDeviceToDeviceType(nativeType);
		mAddress = address;
		mName = name;
		mNativeType = nativeType;
		mAudioProfiles = new ArrayList<>();
		mAudioDescriptors = new ArrayList<>();
		}

		/**
		@@ -163,6 +216,16 @@ public final class AudioDeviceAttributes implements Parcelable {
		return mAddress;
		}

		/**
		* @hide
		* Returns the name of the audio device, or an empty string for devices without one
		* @return the device name
		*/
		@SystemApi
		public @NonNull String getName() {
		return mName;
		}

		/**
		* @hide
		* Returns the internal device type of a device
		@@ -172,9 +235,29 @@ public final class AudioDeviceAttributes implements Parcelable {
		return mNativeType;
		}

		/**
		* @hide
		* Returns the list of AudioProfiles supported by the device
		* @return the list of AudioProfiles
		*/
		@SystemApi
		public @NonNull List<AudioProfile> getAudioProfiles() {
		return mAudioProfiles;
		}

		/**
		* @hide
		* Returns the list of AudioDescriptors supported by the device
		* @return the list of AudioDescriptors
		*/
		@SystemApi
		public @NonNull List<AudioDescriptor> getAudioDescriptors() {
		return mAudioDescriptors;
		}

		@Override
		public int hashCode() {
		return Objects.hash(mRole, mType, mAddress);
		return Objects.hash(mRole, mType, mAddress, mName, mAudioProfiles, mAudioDescriptors);
		}

		@Override
		@@ -182,6 +265,25 @@ public final class AudioDeviceAttributes implements Parcelable {
		if (this == o) return true;
		if (o == null \|\| getClass() != o.getClass()) return false;

		AudioDeviceAttributes that = (AudioDeviceAttributes) o;
		return ((mRole == that.mRole)
		&& (mType == that.mType)
		&& mAddress.equals(that.mAddress)
		&& mName.equals(that.mName)
		&& mAudioProfiles.equals(that.mAudioProfiles)
		&& mAudioDescriptors.equals(that.mAudioDescriptors));
		}

		/**
		* Returns true if the role, type and address are equal. Called to compare with an
		* AudioDeviceAttributes that was created from a native AudioDeviceTypeAddr instance.
		* @param o object to compare with
		* @return whether role, type and address are equal
		*/
		public boolean equalTypeAddress(@Nullable Object o) {
		if (this == o) return true;
		if (o == null \|\| getClass() != o.getClass()) return false;

		AudioDeviceAttributes that = (AudioDeviceAttributes) o;
		return ((mRole == that.mRole)
		&& (mType == that.mType)
		@@ -199,7 +301,10 @@ public final class AudioDeviceAttributes implements Parcelable {
		+ " role:" + roleToString(mRole)
		+ " type:" + (mRole == ROLE_OUTPUT ? AudioSystem.getOutputDeviceName(mNativeType)
		: AudioSystem.getInputDeviceName(mNativeType))
		+ " addr:" + mAddress);
		+ " addr:" + mAddress
		+ " name:" + mName
		+ " profiles:" + mAudioProfiles.toString()
		+ " descriptors:" + mAudioDescriptors.toString());
		}

		@Override
		@@ -212,14 +317,26 @@ public final class AudioDeviceAttributes implements Parcelable {
		dest.writeInt(mRole);
		dest.writeInt(mType);
		dest.writeString(mAddress);
		dest.writeString(mName);
		dest.writeInt(mNativeType);
		dest.writeParcelableArray(
		mAudioProfiles.toArray(new AudioProfile[mAudioProfiles.size()]), flags);
		dest.writeParcelableArray(
		mAudioDescriptors.toArray(new AudioDescriptor[mAudioDescriptors.size()]), flags);
		}

		private AudioDeviceAttributes(@NonNull Parcel in) {
		mRole = in.readInt();
		mType = in.readInt();
		mAddress = in.readString();
		mName = in.readString();
		mNativeType = in.readInt();
		AudioProfile[] audioProfilesArray =
		in.readParcelableArray(AudioProfile.class.getClassLoader(), AudioProfile.class);
		mAudioProfiles = new ArrayList<AudioProfile>(Arrays.asList(audioProfilesArray));
		AudioDescriptor[] audioDescriptorsArray = in.readParcelableArray(
		AudioDescriptor.class.getClassLoader(), AudioDescriptor.class);
		mAudioDescriptors = new ArrayList<AudioDescriptor>(Arrays.asList(audioDescriptorsArray));
		}

		public static final @NonNull Parcelable.Creator<AudioDeviceAttributes> CREATOR =