Merge changes from topic "set_assistants_uid" (72861bd8) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -5986,6 +5986,7 @@ package android.media {

		public class AudioManager {
		method @Deprecated public int abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, android.media.AudioAttributes);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void addAssistantServicesUids(@NonNull java.util.List<java.lang.Integer>);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void addOnPreferredDeviceForStrategyChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.OnPreferredDeviceForStrategyChangedListener) throws java.lang.SecurityException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void addOnPreferredDevicesForCapturePresetChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.OnPreferredDevicesForCapturePresetChangedListener) throws java.lang.SecurityException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void addOnPreferredDevicesForStrategyChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.OnPreferredDevicesForStrategyChangedListener) throws java.lang.SecurityException;
		@@ -5993,7 +5994,9 @@ package android.media {
		method public void clearAudioServerStateCallback();
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean clearPreferredDevicesForCapturePreset(int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int dispatchAudioFocusChange(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public java.util.List<java.lang.Integer> getActiveAssistantServicesUids();
		method @IntRange(from=0) public long getAdditionalOutputDeviceDelay(@NonNull android.media.AudioDeviceInfo);
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public java.util.List<java.lang.Integer> getAssistantServicesUids();
		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.CALL_AUDIO_INTERCEPTION) public android.media.AudioRecord getCallDownlinkExtractionAudioRecord(@NonNull android.media.AudioFormat);
		@@ -6018,6 +6021,7 @@ package android.media {
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int registerAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void registerMuteAwaitConnectionCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.MuteAwaitConnectionCallback);
		method public void registerVolumeGroupCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.VolumeGroupCallback);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void removeAssistantServicesUids(@NonNull java.util.List<java.lang.Integer>);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void removeOnPreferredDeviceForStrategyChangedListener(@NonNull android.media.AudioManager.OnPreferredDeviceForStrategyChangedListener);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void removeOnPreferredDevicesForCapturePresetChangedListener(@NonNull android.media.AudioManager.OnPreferredDevicesForCapturePresetChangedListener);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void removeOnPreferredDevicesForStrategyChangedListener(@NonNull android.media.AudioManager.OnPreferredDevicesForStrategyChangedListener);
		@@ -6025,6 +6029,7 @@ package android.media {
		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 @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setActiveAssistantServiceUids(@NonNull java.util.List<java.lang.Integer>);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean setAdditionalOutputDeviceDelay(@NonNull android.media.AudioDeviceInfo, @IntRange(from=0) long);
		method public void setAudioServerStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.AudioServerStateCallback);
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setDeviceVolumeBehavior(@NonNull android.media.AudioDeviceAttributes, int);

core/jni/android_media_AudioSystem.cpp

+37 −26

Original line number	Diff line number	Diff line
		@@ -2476,37 +2476,47 @@ static jint android_media_AudioSystem_getMinSampleRate(JNIEnv *env, jobject thiz
		return 4000; // SAMPLE_RATE_HZ_MIN (for API)
		}

		static jint
		android_media_AudioSystem_setAssistantUid(JNIEnv *env, jobject thiz, jint uid)
		{
		status_t status = AudioSystem::setAssistantUid(uid);
		static std::vector<uid_t> convertJIntArrayToUidVector(JNIEnv *env, jintArray jArray) {
		std::vector<uid_t> nativeVector;
		if (jArray != nullptr) {
		jsize len = env->GetArrayLength(jArray);

		if (len > 0) {
		int *nativeArray = nullptr;
		nativeArray = env->GetIntArrayElements(jArray, 0);
		if (nativeArray != nullptr) {
		for (size_t i = 0; i < len; i++) {
		nativeVector.push_back(nativeArray[i]);
		}
		env->ReleaseIntArrayElements(jArray, nativeArray, 0);
		}
		}
		}
		return nativeVector;
		}

		static jint android_media_AudioSystem_setAssistantServicesUids(JNIEnv *env, jobject thiz,
		jintArray uids) {
		std::vector<uid_t> nativeUidsVector = convertJIntArrayToUidVector(env, uids);

		status_t status = AudioSystem::setAssistantServicesUids(nativeUidsVector);

		return (jint)nativeToJavaStatus(status);
		}

		static jint android_media_AudioSystem_setHotwordDetectionServiceUid(JNIEnv *env, jobject thiz,
		jint uid) {
		status_t status = AudioSystem::setHotwordDetectionServiceUid(uid);
		static jint android_media_AudioSystem_setActiveAssistantServicesUids(JNIEnv *env, jobject thiz,
		jintArray activeUids) {
		std::vector<uid_t> nativeActiveUidsVector = convertJIntArrayToUidVector(env, activeUids);

		status_t status = AudioSystem::setActiveAssistantServicesUids(nativeActiveUidsVector);

		return (jint)nativeToJavaStatus(status);
		}

		static jint
		android_media_AudioSystem_setA11yServicesUids(JNIEnv *env, jobject thiz, jintArray uids) {
		std::vector<uid_t> nativeUidsVector;

		if (uids != nullptr) {
		jsize len = env->GetArrayLength(uids);
		std::vector<uid_t> nativeUidsVector = convertJIntArrayToUidVector(env, uids);

		if (len > 0) {
		int *nativeUids = nullptr;
		nativeUids = env->GetIntArrayElements(uids, 0);
		if (nativeUids != nullptr) {
		for (size_t i = 0; i < len; i++) {
		nativeUidsVector.push_back(nativeUids[i]);
		}
		env->ReleaseIntArrayElements(uids, nativeUids, 0);
		}
		}
		}
		status_t status = AudioSystem::setA11yServicesUids(nativeUidsVector);
		return (jint)nativeToJavaStatus(status);
		}
		@@ -3000,9 +3010,10 @@ static const JNINativeMethod gMethods[] =
		(void *)android_media_AudioSystem_getReportedSurroundFormats},
		{"setSurroundFormatEnabled", "(IZ)I",
		(void *)android_media_AudioSystem_setSurroundFormatEnabled},
		{"setAssistantUid", "(I)I", (void *)android_media_AudioSystem_setAssistantUid},
		{"setHotwordDetectionServiceUid", "(I)I",
		(void *)android_media_AudioSystem_setHotwordDetectionServiceUid},
		{"setAssistantServicesUids", "([I)I",
		(void *)android_media_AudioSystem_setAssistantServicesUids},
		{"setActiveAssistantServicesUids", "([I)I",
		(void *)android_media_AudioSystem_setActiveAssistantServicesUids},
		{"setA11yServicesUids", "([I)I", (void *)android_media_AudioSystem_setA11yServicesUids},
		{"isHapticPlaybackSupported", "()Z",
		(void *)android_media_AudioSystem_isHapticPlaybackSupported},

media/java/android/media/AudioManager.java

+101 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ import java.util.concurrent.ConcurrentHashMap;
		import java.util.concurrent.Executor;
		import java.util.concurrent.Executors;
		import java.util.concurrent.TimeUnit;
		import java.util.stream.Collectors;

		/**
		* AudioManager provides access to volume and ringer mode control.
		@@ -8342,6 +8343,106 @@ public class AudioManager {
		}
		}

		/**
		* Add UID's that can be considered as assistant.
		*
		* @param assistantUids UID's of the services that can be considered as assistant.
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
		public void addAssistantServicesUids(@NonNull List<Integer> assistantUids) {
		try {
		getService().addAssistantServicesUids(assistantUids.stream()
		.mapToInt(Integer::intValue).toArray());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Remove UID's that can be considered as assistant.
		*
		* @param assistantUids UID'S of the services that should be remove.
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
		public void removeAssistantServicesUids(@NonNull List<Integer> assistantUids) {
		try {
		getService().removeAssistantServicesUids(assistantUids.stream()
		.mapToInt(Integer::intValue).toArray());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Get the list of assistants UIDs that been added with the
		* {@link #addAssistantServicesUids(List)} (List)} and not yet removed with
		* {@link #removeAssistantServicesUids(List)}
		*
		* @return list of assistants UID's
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
		public @NonNull List<Integer> getAssistantServicesUids() {
		try {
		int[] uids = getService().getAssistantServicesUids();
		return Arrays.stream(uids).boxed().collect(Collectors.toList());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Sets UID's that can be considered as active assistant. Calling the API with a new list will
		* overwrite previous list. If the list of UIDs is empty then no UID will be considered active.
		* In this manner calling the API with an empty list will remove all UID's previously set.
		*
		* @param assistantUids UID'S of the services that can be considered active assistant. Can be
		* an empty list, for this no UID will be considered active.
		*
		* <p> Note that during audio service crash reset and after boot up the list of active assistant
		* UID's will be reset to an empty list (i.e. no UID will be considered as an active assistant).
		* Just after user switch the list of active assistant will also reset to empty.
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
		public void setActiveAssistantServiceUids(@NonNull List<Integer> assistantUids) {
		try {
		getService().setActiveAssistantServiceUids(assistantUids.stream()
		.mapToInt(Integer::intValue).toArray());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Get the list of active assistant UIDs last set with the
		* {@link #setActiveAssistantServiceUids(List)}
		*
		* @return list of active assistants UID's
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
		public @NonNull List<Integer> getActiveAssistantServicesUids() {
		try {
		int[] uids = getService().getActiveAssistantServiceUids();
		return Arrays.stream(uids).boxed().collect(Collectors.toList());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		private final Object mMuteAwaitConnectionListenerLock = new Object();

		@GuardedBy("mMuteAwaitConnectionListenerLock")

media/java/android/media/AudioManagerInternal.java

+16 −7

Original line number	Diff line number	Diff line
		@@ -38,18 +38,27 @@ public abstract class AudioManagerInternal {

		public abstract void updateRingerModeAffectedStreamsInternal();

		public abstract void setAccessibilityServiceUids(IntArray uids);

		/**
		* Notify the UID of the currently active {@link android.service.voice.HotwordDetectionService}.
		* Add the UID for a new assistant service
		*
		* <p>The caller is expected to take care of any performance implications, e.g. by using a
		* background thread to call this method.</p>
		* @param uid UID of the newly available assistants
		*/
		public abstract void addAssistantServiceUid(int uid);

		/**
		* Remove the UID for an existing assistant service
		*
		* @param uid UID of the currently active service or {@link android.os.Process#INVALID_UID} if
		* none.
		* @param uid UID of the currently available assistant
		*/
		public abstract void setHotwordDetectionServiceUid(int uid);
		public abstract void removeAssistantServiceUid(int uid);

		public abstract void setAccessibilityServiceUids(IntArray uids);
		/**
		* Set the currently active assistant service UIDs
		* @param activeUids active UIDs of the assistant service
		*/
		public abstract void setActiveAssistantServicesUids(IntArray activeUids);

		/**
		* Called by {@link com.android.server.inputmethod.InputMethodManagerService} to notify the UID

media/java/android/media/AudioSystem.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -1856,16 +1856,15 @@ public class AudioSystem

		/**
		* @hide
		* Communicate UID of active assistant to audio policy service.
		* Communicate UIDs of the active assistant to audio policy service.
		*/
		public static native int setAssistantUid(int uid);
		public static native int setActiveAssistantServicesUids(int[] uids);

		/**
		* Communicate UID of the current {@link android.service.voice.HotwordDetectionService} to audio
		* policy service.
		* @hide
		* Communicate UIDs of assistant to audio policy service.
		*/
		public static native int setHotwordDetectionServiceUid(int uid);
		public static native int setAssistantServicesUids(int[] uids);

		/**
		* @hide