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

Commit 285481da authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "remove-mp2-from-apex" into qt-dev 

* changes:
  Remove MediaPlayer2 from media apex.
  Remove BufferingParams from TestApi.
parents 3b33981e 9b505e98

api/test-current.txt

+0 −16
Original line number Diff line number Diff line
@@ -1130,22 +1130,6 @@ package android.media { 
    field public static final String SAMPLE_RATE = "android.media.audiotrack.sampleRate";

  }



  public final class BufferingParams implements android.os.Parcelable {

    method public int describeContents();

    method public int getInitialMarkMs();

    method public int getResumePlaybackMarkMs();

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.media.BufferingParams> CREATOR;

  }



  public static class BufferingParams.Builder {

    ctor public BufferingParams.Builder();

    ctor public BufferingParams.Builder(android.media.BufferingParams);

    method public android.media.BufferingParams build();

    method public android.media.BufferingParams.Builder setInitialMarkMs(int);

    method public android.media.BufferingParams.Builder setResumePlaybackMarkMs(int);

  }



  public static final class MediaCodecInfo.VideoCapabilities.PerformancePoint {

    ctor public MediaCodecInfo.VideoCapabilities.PerformancePoint(int, int, int, int, @NonNull android.util.Size);

    ctor public MediaCodecInfo.VideoCapabilities.PerformancePoint(@NonNull android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint, @NonNull android.util.Size);

media/Android.bp

+1 −8
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ java_library { 
        ],

    },



    static_libs: [

        "mediaplayer2-protos",

    ],



    permitted_packages: [

        "android.media",

    ],
@@ -43,7 +39,6 @@ filegroup { 
    name: "updatable-media-srcs",

    srcs: [

        ":mediasession2-srcs",

        ":mediaplayer2-srcs",

    ],

}
@@ -51,7 +46,6 @@ filegroup { 
    name: "updatable-media-srcs-without-aidls",

    srcs : [

        ":mediasession2-srcs-without-aidls",

        ":mediaplayer2-srcs",

    ],

}
@@ -109,8 +103,7 @@ metalava_updatable_media_args = " --error UnhiddenSystemApi " + 
    "--hide MissingPermission --hide BroadcastBehavior " +

    "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " +

    "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " +

    "--hide HiddenTypedefConstant --show-annotation android.annotation.SystemApi " +

    " --show-annotation android.annotation.TestApi "

    "--hide HiddenTypedefConstant --show-annotation android.annotation.SystemApi "



droidstubs {

    name: "updatable-media-stubs",

media/apex/java/android/media/BufferingParams.java

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.media;



import android.annotation.IntDef;

import android.annotation.TestApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -64,7 +63,6 @@ import java.lang.annotation.RetentionPolicy; 
 * <p>Users should use {@link Builder} to change {@link BufferingParams}.

 * @hide

 */

@TestApi

public final class BufferingParams implements Parcelable {

    private static final int BUFFERING_NO_MARK = -1;