From 90654745fa698c011283749b3acc694816d7bd7d Mon Sep 17 00:00:00 2001
From: Dongwon Kang <dwkang@google.com>
Date: Tue, 16 Apr 2019 11:14:38 -0700
Subject: [PATCH 1/2] Remove BufferingParams from TestApi.

This class was missed when hiding MediaPlayer2.

Test: make update-api & cts
Bug: 130420617
Change-Id: I7066c4c4fcab4315f4e878a380f05766bbf90ad1
---
 api/test-current.txt                             | 16 ----------------
 .../apex/java/android/media/BufferingParams.java |  2 --
 2 files changed, 18 deletions(-)

diff --git a/api/test-current.txt b/api/test-current.txt
index 811ad43b5a9e6..18c313893fa60 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -1129,22 +1129,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);
diff --git a/media/apex/java/android/media/BufferingParams.java b/media/apex/java/android/media/BufferingParams.java
index 83594d474b37a..943f14277fc3d 100644
--- a/media/apex/java/android/media/BufferingParams.java
+++ b/media/apex/java/android/media/BufferingParams.java
@@ -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;
 

From 9b505e984bc893b67126a77d90d4b61d8d8c8fce Mon Sep 17 00:00:00 2001
From: Dongwon Kang <dwkang@google.com>
Date: Tue, 16 Apr 2019 11:45:48 -0700
Subject: [PATCH 2/2] Remove MediaPlayer2 from media apex.

Test: build, atest MediaSession2Test
Bug: 130637522
Change-Id: I65a8bc3e483d8653da6afa55d442185a554d5901
---
 media/Android.bp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/media/Android.bp b/media/Android.bp
index 5b7b26cef27a1..70dacb20cde72 100644
--- a/media/Android.bp
+++ b/media/Android.bp
@@ -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",