Merge "[BUG] audio: Misalignement of Native/Java AudioAttributes" (47818c0a) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioAttributes.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -1433,6 +1433,8 @@ public final class AudioAttributes implements Parcelable {
		return new String("AudioAttributes:"
		+ " usage=" + usageToString()
		+ " content=" + contentTypeToString()
		+ (mSource != MediaRecorder.AudioSource.AUDIO_SOURCE_INVALID
		? " source=" + MediaRecorder.toLogFriendlyAudioSource(mSource) : "")
		+ " flags=0x" + Integer.toHexString(mFlags).toUpperCase()
		+ " tags=" + mFormattedTags
		+ " bundle=" + (mBundle == null ? "null" : mBundle.toString()));

media/java/android/media/audiopolicy/AudioProductStrategy.java

+4 −9

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.media.AudioAttributes;
		import android.media.AudioSystem;
		import android.media.MediaRecorder;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.text.TextUtils;
		@@ -130,9 +129,7 @@ public final class AudioProductStrategy implements Parcelable {
		return aa;
		}
		}
		return new AudioAttributes.Builder()
		.setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)
		.setUsage(AudioAttributes.USAGE_UNKNOWN).build();
		return DEFAULT_ATTRIBUTES;
		}

		/**
		@@ -217,7 +214,7 @@ public final class AudioProductStrategy implements Parcelable {
		@SystemApi
		public @NonNull AudioAttributes getAudioAttributes() {
		// We need a choice, so take the first one
		return mAudioAttributesGroups.length == 0 ? (new AudioAttributes.Builder().build())
		return mAudioAttributesGroups.length == 0 ? DEFAULT_ATTRIBUTES
		: mAudioAttributesGroups[0].getAudioAttributes();
		}

		@@ -358,8 +355,7 @@ public final class AudioProductStrategy implements Parcelable {
		* Default attributes, with default source to be aligned with native.
		*/
		private static final @NonNull AudioAttributes DEFAULT_ATTRIBUTES =
		new AudioAttributes.Builder().setCapturePreset(MediaRecorder.AudioSource.DEFAULT)
		.build();
		new AudioAttributes.Builder().build();

		/**
		* @hide
		@@ -429,8 +425,7 @@ public final class AudioProductStrategy implements Parcelable {

		public @NonNull AudioAttributes getAudioAttributes() {
		// We need a choice, so take the first one
		return mAudioAttributes.length == 0 ? (new AudioAttributes.Builder().build())
		: mAudioAttributes[0];
		return mAudioAttributes.length == 0 ? DEFAULT_ATTRIBUTES : mAudioAttributes[0];
		}

		/**