Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AudioPolicy: more TestApi for ... testing" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-17 00:22:04 +00:00
committed by Android (Google) Code Review
parent aba783991a 19777d9c49
commit 111ad6a13e
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/test-current.txt
View File

@@ -1104,6 +1104,7 @@ package android.media {
method @RequiresPermission("android.permission.MODIFY_AUDIO_ROUTING") public void setFocusRequestResult(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);
method @RequiresPermission("android.permission.MODIFY_AUDIO_ROUTING") public void unregisterAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);
method @RequiresPermission("android.permission.MODIFY_AUDIO_ROUTING") public void unregisterAudioPolicyAsync(@NonNull android.media.audiopolicy.AudioPolicy);
field public static final int SUCCESS = 0; // 0x0
}
public static final class AudioRecord.MetricsConstants {
@@ -1241,8 +1242,10 @@ package android.media.audiopolicy {
method public int detachMixes(@NonNull java.util.List<android.media.audiopolicy.AudioMix>);
method public int getFocusDuckingBehavior();
method public int getStatus();
method public boolean removeUidDeviceAffinity(int);
method public int setFocusDuckingBehavior(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public void setRegistration(String);
method public boolean setUidDeviceAffinity(int, @NonNull java.util.List<android.media.AudioDeviceInfo>);
method public String toLogFriendlyString();
field public static final int FOCUS_POLICY_DUCKING_DEFAULT = 0; // 0x0
field public static final int FOCUS_POLICY_DUCKING_IN_APP = 0; // 0x0

1
media/java/android/media/AudioManager.java
View File

@@ -4523,6 +4523,7 @@ public class AudioManager {
*/
/** @hide */
@TestApi
@SystemApi
public static final int SUCCESS = AudioSystem.SUCCESS;
/**

2
media/java/android/media/audiopolicy/AudioPolicy.java
View File

@@ -416,6 +416,7 @@ public class AudioPolicy {
* @param devices list of devices to which the audio stream of the application may be routed.
* @return true if the change was successful, false otherwise.
*/
@TestApi
@SystemApi
public boolean setUidDeviceAffinity(int uid, @NonNull List<AudioDeviceInfo> devices) {
if (devices == null) {
@@ -457,6 +458,7 @@ public class AudioPolicy {
* @param uid UID of the application affected.
* @return true if the change was successful, false otherwise.
*/
@TestApi
@SystemApi
public boolean removeUidDeviceAffinity(int uid) {
synchronized (mLock) {