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

Merge "AudioFocusRequest: getOnAudioFocusChangeListener in test API" into pi-dev

Browse Source 
am: 301a925597

Change-Id: Ic4a1ef1a4746117fbb6321f84b65b70e7e366c2a
This commit is contained in:
Jean-Michel Trivi
2018-04-06 19:09:17 -07:00
committed by android-build-merger
parent b45fa853b4 301a925597
commit 4a09bab517
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/test-current.txt
View File

@@ -469,6 +469,10 @@ package android.location {
package android.media {
public final class AudioFocusRequest {
method public android.media.AudioManager.OnAudioFocusChangeListener getOnAudioFocusChangeListener();
}
public final class AudioFormat implements android.os.Parcelable {
method public static int channelCountFromInChannelMask(int);
method public static int channelCountFromOutChannelMask(int);

2
media/java/android/media/AudioFocusRequest.java
View File

@@ -19,6 +19,7 @@ package android.media;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.media.AudioManager.OnAudioFocusChangeListener;
import android.os.Bundle;
import android.os.Handler;
@@ -262,6 +263,7 @@ public final class AudioFocusRequest {
* Returns the focus change listener set for this {@code AudioFocusRequest}.
* @return null if no {@link AudioManager.OnAudioFocusChangeListener} was set.
*/
@TestApi
public @Nullable OnAudioFocusChangeListener getOnAudioFocusChangeListener() {
return mFocusListener;
}