Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a09bab5 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

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

am: 301a9255

Change-Id: Ic4a1ef1a4746117fbb6321f84b65b70e7e366c2a
parents b45fa853 301a9255

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -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);

media/java/android/media/AudioFocusRequest.java

+2 −0
Original line number Diff line number Diff line
@@ -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;

    }