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

Commit 163b606b authored by Mikhail Naganov's avatar Mikhail Naganov Committed by android-build-merger
Browse files

Merge "AudioPresentation: Replace @VisibleForTesting with @TestApi" into pi-dev 

am: d1bc30a4

Change-Id: Ie670cb4090d982d527a0a84aa22c05dbec8fdf27
parents 30cb5926 d1bc30a4

api/test-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -476,6 +476,12 @@ package android.media { 
    method public static boolean isEncodingLinearPcm(int);

  }



  public final class AudioPresentation {

    ctor public AudioPresentation(int, int, java.util.Map<java.lang.String, java.lang.String>, java.lang.String, int, boolean, boolean, boolean);

    method public int getPresentationId();

    method public int getProgramId();

  }



  public static final class VolumeShaper.Configuration.Builder {

    method public android.media.VolumeShaper.Configuration.Builder setOptionFlags(int);

  }

media/java/android/media/AudioPresentation.java

+4 −5
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ package android.media; 


import android.annotation.IntDef;

import android.annotation.NonNull;



import com.android.internal.annotations.VisibleForTesting;

import android.annotation.TestApi;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -94,7 +93,7 @@ public final class AudioPresentation { 
    /**

     * @hide

     */

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    @TestApi

    public AudioPresentation(int presentationId,

                        int programId,

                        @NonNull Map<String, String> labels,
@@ -119,7 +118,7 @@ public final class AudioPresentation { 
     * decoder. Presentation id is typically sequential, but does not have to be.

     * @hide

     */

    @VisibleForTesting

    @TestApi

    public int getPresentationId() {

        return mPresentationId;

    }
@@ -129,7 +128,7 @@ public final class AudioPresentation { 
     * Program id can be used to further uniquely identify the presentation to a decoder.

     * @hide

     */

    @VisibleForTesting

    @TestApi

    public int getProgramId() {

        return mProgramId;

    }