Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb9c5419 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Rename AudioDeviceAddress to AudioDevice"

parents a3ada360 036c5aca

api/system-current.txt

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

  }













  public final class AudioDeviceAddress implements android.os.Parcelable {













    ctor public AudioDeviceAddress(@NonNull android.media.AudioDeviceInfo);













    ctor public AudioDeviceAddress(int, int, @NonNull String);













  public final class AudioDevice implements android.os.Parcelable {













    ctor public AudioDevice(@NonNull android.media.AudioDeviceInfo);













    ctor public AudioDevice(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.AudioDeviceAddress> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.media.AudioDevice> CREATOR;















    field public static final int ROLE_INPUT = 1; // 0x1















    field public static final int ROLE_OUTPUT = 2; // 0x2















  }










@@ -4261,11 +4261,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.AudioDeviceAddress> getDevicesForAttributes(@NonNull android.media.AudioAttributes);













    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public java.util.List<android.media.AudioDevice> 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.AudioDeviceAddress getPreferredDeviceForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy);













    method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public android.media.AudioDevice 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();









@@ -4279,7 +4279,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.AudioDeviceAddress);













    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 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);










@@ -4375,7 +4375,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.AudioDeviceAddress);













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















  }





























}

































core/jni/Android.bp



+1
−1




























Original line number
Diff line number
Diff line








@@ -153,7 +153,7 @@ cc_library_shared {













                "android_util_MemoryIntArray.cpp",















                "android_util_Process.cpp",















                "android_util_jar_StrictJarFile.cpp",













                "android_media_AudioDeviceAddress.cpp",













                "android_media_AudioDevice.cpp",















                "android_media_AudioEffectDescriptor.cpp",















                "android_media_AudioRecord.cpp",















                "android_media_AudioSystem.cpp",

































core/jni/AndroidRuntime.cpp



+135
−135




























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_AudioDeviceAddress(JNIEnv *env);













extern int register_android_media_AudioDevice(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);










@@ -1515,7 +1515,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_AudioDeviceAddress),













        REG_JNI(register_android_media_AudioDevice),















        REG_JNI(register_android_media_AudioEffectDescriptor),















        REG_JNI(register_android_media_AudioSystem),















        REG_JNI(register_android_media_AudioRecord),

































core/jni/android_media_AudioDeviceAddress.cpp→core/jni/android_media_AudioDevice.cpp



+14
−16




























Original line number
Diff line number
Diff line








@@ -14,40 +14,38 @@













 * limitations under the License.















 */





























#include "core_jni_helpers.h"













#include "android_media_AudioDeviceAddress.h"













#include "android_media_AudioDevice.h"















#include "android_media_AudioErrors.h"













#include "core_jni_helpers.h"































#include <media/AudioDeviceTypeAddr.h>































using namespace android;





























static jclass gAudioDeviceAddressClass;













static jmethodID gAudioDeviceAddressCstor;













static jclass gAudioDeviceClass;













static jmethodID gAudioDeviceCstor;































namespace android {





























jint createAudioDeviceAddressFromNative(













        JNIEnv *env, jobject *jAudioDeviceAddress,













jint createAudioDeviceFromNative(JNIEnv *env, jobject *jAudioDevice,















                                 const AudioDeviceTypeAddr *devTypeAddr) {















    jint jStatus = (jint)AUDIO_JAVA_SUCCESS;















    jint jNativeType = (jint)devTypeAddr->mType;















    ScopedLocalRef<jstring> jAddress(env, env->NewStringUTF(devTypeAddr->mAddress.data()));





























    *jAudioDeviceAddress = env->NewObject(gAudioDeviceAddressClass, gAudioDeviceAddressCstor,













            jNativeType, jAddress.get());













    *jAudioDevice =













            env->NewObject(gAudioDeviceClass, gAudioDeviceCstor, jNativeType, jAddress.get());































    return jStatus;















}





























}













} // namespace android





























int register_android_media_AudioDeviceAddress(JNIEnv *env)













{













    jclass audioDeviceTypeAddressClass = FindClassOrDie(env, "android/media/AudioDeviceAddress");













    gAudioDeviceAddressClass = MakeGlobalRefOrDie(env, audioDeviceTypeAddressClass);













    gAudioDeviceAddressCstor = GetMethodIDOrDie(env, audioDeviceTypeAddressClass, "<init>",













                                                "(ILjava/lang/String;)V");













int register_android_media_AudioDevice(JNIEnv *env) {













    jclass audioDeviceTypeAddressClass = FindClassOrDie(env, "android/media/AudioDevice");













    gAudioDeviceClass = MakeGlobalRefOrDie(env, audioDeviceTypeAddressClass);













    gAudioDeviceCstor =













            GetMethodIDOrDie(env, audioDeviceTypeAddressClass, "<init>", "(ILjava/lang/String;)V");































    return 0;















}
























core/jni/android_media_AudioDeviceAddress.h→core/jni/android_media_AudioDevice.h



+6
−6




























Original line number
Diff line number
Diff line








@@ -14,19 +14,19 @@













 * limitations under the License.















 */





























#ifndef ANDROID_MEDIA_AUDIODEVICEADDRESS_H













#define ANDROID_MEDIA_AUDIODEVICEADDRESS_H













#ifndef ANDROID_MEDIA_AUDIODEVICE_H













#define ANDROID_MEDIA_AUDIODEVICE_H





























#include <system/audio.h>















#include <media/AudioDeviceTypeAddr.h>













#include <system/audio.h>































#include "jni.h"































namespace android {





























// Create a Java AudioDeviceAddress instance from a C++ AudioDeviceTypeAddress













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





























extern jint createAudioDeviceAddressFromNative(JNIEnv *env, jobject *jAudioDeviceAddress,













extern jint createAudioDeviceFromNative(JNIEnv *env, jobject *jAudioDevice,















                                        const AudioDeviceTypeAddr *devTypeAddr);















} // namespace android