Merge "Rename AudioDevice to AudioDeviceAttributes" (1c4cb8be) · Commits · e / os / android_frameworks_base

api/system-current.txt

+9 −9

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

		public final class AudioDevice implements android.os.Parcelable {
		ctor public AudioDevice(@NonNull android.media.AudioDeviceInfo);
		ctor public AudioDevice(int, int, @NonNull String);
		public final class AudioDeviceAttributes implements android.os.Parcelable {
		ctor public AudioDeviceAttributes(@NonNull android.media.AudioDeviceInfo);
		ctor public AudioDeviceAttributes(int, int, @NonNull String);
		method public int describeContents();
		method @NonNull public String getAddress();
		method public int getRole();
		method public int getType();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.media.AudioDevice> CREATOR;
		field @NonNull public static final android.os.Parcelable.Creator<android.media.AudioDeviceAttributes> CREATOR;
		field public static final int ROLE_INPUT = 1; // 0x1
		field public static final int ROLE_OUTPUT = 2; // 0x2
		}
		@@ -4293,11 +4293,11 @@ package android.media {
		method @IntRange(from=0) public int getAdditionalOutputDeviceDelay(@NonNull android.media.AudioDeviceInfo);
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static java.util.List<android.media.audiopolicy.AudioProductStrategy> getAudioProductStrategies();
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static java.util.List<android.media.audiopolicy.AudioVolumeGroup> getAudioVolumeGroups();
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public java.util.List<android.media.AudioDevice> getDevicesForAttributes(@NonNull android.media.AudioAttributes);
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public java.util.List<android.media.AudioDeviceAttributes> getDevicesForAttributes(@NonNull android.media.AudioAttributes);
		method @IntRange(from=0) public int getMaxAdditionalOutputDeviceDelay(@NonNull android.media.AudioDeviceInfo);
		method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getMaxVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);
		method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getMinVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);
		method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public android.media.AudioDevice getPreferredDeviceForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy);
		method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public android.media.AudioDeviceAttributes getPreferredDeviceForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy);
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int[] getSupportedSystemUsages();
		method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);
		method public boolean isAudioServerRunning();
		@@ -4312,7 +4312,7 @@ package android.media {
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean setAdditionalOutputDeviceDelay(@NonNull android.media.AudioDeviceInfo, @IntRange(from=0) int);
		method public void setAudioServerStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.AudioServerStateCallback);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setFocusRequestResult(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean setPreferredDeviceForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy, @NonNull android.media.AudioDevice);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean setPreferredDeviceForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy, @NonNull android.media.AudioDeviceAttributes);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setSupportedSystemUsages(@NonNull int[]);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setVolumeIndexForAttributes(@NonNull android.media.AudioAttributes, int, int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void unregisterAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);
		@@ -4332,7 +4332,7 @@ package android.media {
		}

		public static interface AudioManager.OnPreferredDeviceForStrategyChangedListener {
		method public void onPreferredDeviceForStrategyChanged(@NonNull android.media.audiopolicy.AudioProductStrategy, @Nullable android.media.AudioDevice);
		method public void onPreferredDeviceForStrategyChanged(@NonNull android.media.audiopolicy.AudioProductStrategy, @Nullable android.media.AudioDeviceAttributes);
		}

		public abstract static class AudioManager.VolumeGroupCallback {
		@@ -4412,7 +4412,7 @@ package android.media {
		package android.media.audiofx {

		public class AudioEffect {
		ctor @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public AudioEffect(@NonNull java.util.UUID, @NonNull android.media.AudioDevice);
		ctor @RequiresPermission("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS") public AudioEffect(@NonNull java.util.UUID, @NonNull android.media.AudioDeviceAttributes);
		}

		}

core/jni/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ cc_library_shared {
		"android_util_Binder.cpp",
		"android_util_MemoryIntArray.cpp",
		"android_util_Process.cpp",
		"android_media_AudioDevice.cpp",
		"android_media_AudioDeviceAttributes.cpp",
		"android_media_AudioEffectDescriptor.cpp",
		"android_media_AudioRecord.cpp",
		"android_media_AudioSystem.cpp",

core/jni/AndroidRuntime.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ extern int register_android_hardware_UsbDeviceConnection(JNIEnv *env);
		extern int register_android_hardware_UsbRequest(JNIEnv *env);
		extern int register_android_hardware_location_ActivityRecognitionHardware(JNIEnv* env);

		extern int register_android_media_AudioDevice(JNIEnv* env);
		extern int register_android_media_AudioDeviceAttributes(JNIEnv* env);
		extern int register_android_media_AudioEffectDescriptor(JNIEnv *env);
		extern int register_android_media_AudioRecord(JNIEnv *env);
		extern int register_android_media_AudioSystem(JNIEnv *env);
		@@ -1517,7 +1517,7 @@ static const RegJNIRec gRegJNI[] = {
		REG_JNI(register_android_hardware_UsbDeviceConnection),
		REG_JNI(register_android_hardware_UsbRequest),
		REG_JNI(register_android_hardware_location_ActivityRecognitionHardware),
		REG_JNI(register_android_media_AudioDevice),
		REG_JNI(register_android_media_AudioDeviceAttributes),
		REG_JNI(register_android_media_AudioEffectDescriptor),
		REG_JNI(register_android_media_AudioSystem),
		REG_JNI(register_android_media_AudioRecord),

core/jni/android_media_AudioDevice.cpp→core/jni/android_media_AudioDeviceAttributes.cpp

+11 −10

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		#include "android_media_AudioDevice.h"
		#include "android_media_AudioDeviceAttributes.h"
		#include "android_media_AudioErrors.h"
		#include "core_jni_helpers.h"

		@@ -22,29 +22,30 @@

		using namespace android;

		static jclass gAudioDeviceClass;
		static jmethodID gAudioDeviceCstor;
		static jclass gAudioDeviceAttributesClass;
		static jmethodID gAudioDeviceAttributesCstor;

		namespace android {

		jint createAudioDeviceFromNative(JNIEnv env, jobject jAudioDevice,
		jint createAudioDeviceAttributesFromNative(JNIEnv env, jobject jAudioDeviceAttributes,
		const AudioDeviceTypeAddr *devTypeAddr) {
		jint jStatus = (jint)AUDIO_JAVA_SUCCESS;
		jint jNativeType = (jint)devTypeAddr->mType;
		ScopedLocalRef<jstring> jAddress(env, env->NewStringUTF(devTypeAddr->mAddress.data()));

		*jAudioDevice =
		env->NewObject(gAudioDeviceClass, gAudioDeviceCstor, jNativeType, jAddress.get());
		*jAudioDeviceAttributes = env->NewObject(gAudioDeviceAttributesClass, gAudioDeviceAttributesCstor,
		jNativeType, jAddress.get());

		return jStatus;
		}

		} // namespace android

		int register_android_media_AudioDevice(JNIEnv *env) {
		jclass audioDeviceTypeAddressClass = FindClassOrDie(env, "android/media/AudioDevice");
		gAudioDeviceClass = MakeGlobalRefOrDie(env, audioDeviceTypeAddressClass);
		gAudioDeviceCstor =
		int register_android_media_AudioDeviceAttributes(JNIEnv *env) {
		jclass audioDeviceTypeAddressClass =
		FindClassOrDie(env, "android/media/AudioDeviceAttributes");
		gAudioDeviceAttributesClass = MakeGlobalRefOrDie(env, audioDeviceTypeAddressClass);
		gAudioDeviceAttributesCstor =
		GetMethodIDOrDie(env, audioDeviceTypeAddressClass, "<init>", "(ILjava/lang/String;)V");

		return 0;

core/jni/android_media_AudioDevice.h→core/jni/android_media_AudioDeviceAttributes.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@
		* limitations under the License.
		*/

		#ifndef ANDROID_MEDIA_AUDIODEVICE_H
		#define ANDROID_MEDIA_AUDIODEVICE_H
		#ifndef ANDROID_MEDIA_AUDIODEVICEATTRIBUTES_H
		#define ANDROID_MEDIA_AUDIODEVICEATTRIBUTES_H

		#include <media/AudioDeviceTypeAddr.h>
		#include <system/audio.h>
		@@ -24,9 +24,9 @@

		namespace android {

		// Create a Java AudioDevice instance from a C++ AudioDeviceTypeAddress
		// Create a Java AudioDeviceAttributes instance from a C++ AudioDeviceTypeAddress

		extern jint createAudioDeviceFromNative(JNIEnv env, jobject jAudioDevice,
		extern jint createAudioDeviceAttributesFromNative(JNIEnv env, jobject jAudioDeviceAttributes,
		const AudioDeviceTypeAddr *devTypeAddr);
		} // namespace android