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

2 files changed, 6 insertions, 0 deletions

diff --git a/api/test-current.txt b/api/test-current.txt
index b7faac9aec25..9f2aaab601b2 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -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);
diff --git a/media/java/android/media/AudioFocusRequest.java b/media/java/android/media/AudioFocusRequest.java
index 7104dad4dc4c..fe89b89dcfec 100644
--- a/media/java/android/media/AudioFocusRequest.java
+++ b/media/java/android/media/AudioFocusRequest.java
@@ -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;
     }