Merge "Audio routing by strategy SystemApi" (25087dbf) · Commits · e / os / android_frameworks_base

api/system-current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -3928,16 +3928,19 @@ package android.media {
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static java.util.List<android.media.audiopolicy.AudioVolumeGroup> getAudioVolumeGroups();
		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 @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);
		method public boolean isAudioServerRunning();
		method public boolean isHdmiSystemAudioSupported();
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int registerAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);
		method public void registerVolumeGroupCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.VolumeGroupCallback);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean removePreferredDeviceForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, @NonNull android.media.AudioAttributes, int, int) throws java.lang.IllegalArgumentException;
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.MODIFY_AUDIO_ROUTING}) public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, @NonNull android.media.AudioAttributes, int, int, android.media.audiopolicy.AudioPolicy) throws java.lang.IllegalArgumentException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int requestAudioFocus(@NonNull android.media.AudioFocusRequest, @Nullable android.media.audiopolicy.AudioPolicy);
		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 void setVolumeIndexForAttributes(@NonNull android.media.AudioAttributes, int, int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void unregisterAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void unregisterAudioPolicyAsync(@NonNull android.media.audiopolicy.AudioPolicy);
		@@ -4108,9 +4111,11 @@ package android.media.audiopolicy {
		}

		public final class AudioProductStrategy implements android.os.Parcelable {
		method @NonNull public static android.media.audiopolicy.AudioProductStrategy createInvalidAudioProductStrategy(int);
		method public int describeContents();
		method @NonNull public android.media.AudioAttributes getAudioAttributes();
		method public int getId();
		method public boolean supportsAudioAttributes(@NonNull android.media.AudioAttributes);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioProductStrategy> CREATOR;
		}

core/jni/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,7 @@ cc_library_shared {
		"android_util_StringBlock.cpp",
		"android_util_XmlBlock.cpp",
		"android_util_jar_StrictJarFile.cpp",
		"android_media_AudioDeviceAddress.cpp",
		"android_media_AudioEffectDescriptor.cpp",
		"android_media_AudioRecord.cpp",
		"android_media_AudioSystem.cpp",

core/jni/AndroidRuntime.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +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_AudioEffectDescriptor(JNIEnv *env);
		extern int register_android_media_AudioRecord(JNIEnv *env);
		extern int register_android_media_AudioSystem(JNIEnv *env);
		@@ -1510,6 +1511,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_AudioEffectDescriptor),
		REG_JNI(register_android_media_AudioSystem),
		REG_JNI(register_android_media_AudioRecord),

core/jni/android_media_AudioDeviceAddress.cpp

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include "core_jni_helpers.h"
		#include "android_media_AudioDeviceAddress.h"
		#include "android_media_AudioErrors.h"

		#include <media/AudioDeviceTypeAddr.h>

		using namespace android;

		static jclass gAudioDeviceAddressClass;
		static jmethodID gAudioDeviceAddressCstor;

		namespace android {

		jint createAudioDeviceAddressFromNative(
		JNIEnv env, jobject jAudioDeviceAddress,
		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());

		return jStatus;
		}

		}

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

		return 0;
		}

core/jni/android_media_AudioDeviceAddress.h

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef ANDROID_MEDIA_AUDIODEVICEADDRESS_H
		#define ANDROID_MEDIA_AUDIODEVICEADDRESS_H

		#include <system/audio.h>
		#include <media/AudioDeviceTypeAddr.h>

		#include "jni.h"

		namespace android {

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

		extern jint createAudioDeviceAddressFromNative(JNIEnv env, jobject jAudioDeviceAddress,
		const AudioDeviceTypeAddr *devTypeAddr);
		} // namespace android

		#endif
		No newline at end of file