From 1dfec66d30f5703cb90656add83f6127221f9f13 Mon Sep 17 00:00:00 2001
From: Hyundo Moon <hdmoon@google.com>
Date: Mon, 28 Jan 2019 20:24:37 +0900
Subject: [PATCH] Make hidden constructor of PlaybackInfo as @SystemApi

When the android build setting is configured to a rule which moves
MediaSession1 related codes to mainline module, the non-public and
non-system APIs in the module cannot be used by the framework.

This CL makes the hidden constructor of PlaybackInfo as
system API, so that it can be used by the framework.

Bug: 123500940
Test: make update-api -j; make -j;
Change-Id: I8583d6f79c70f8bbbbedfa0a75676218aeec58e6
---
 api/system-current.txt                                     | 4 ++++
 media/apex/java/android/media/session/MediaController.java | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index e5ae9a7002b45..e2b213864ecc7 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -3618,6 +3618,10 @@ package android.media.session {
     method public void unregisterCallback(@NonNull android.media.session.ControllerCallbackLink);
   }
 
+  public static final class MediaController.PlaybackInfo implements android.os.Parcelable {
+    ctor public MediaController.PlaybackInfo(int, int, int, int, android.media.AudioAttributes);
+  }
+
   public abstract static class MediaSession.Callback {
     method public void onSetMediaButtonEventDelegate(@NonNull android.media.session.MediaSessionEngine.MediaButtonEventDelegate);
   }
diff --git a/media/apex/java/android/media/session/MediaController.java b/media/apex/java/android/media/session/MediaController.java
index d43acf47b8636..944832e3c5e49 100644
--- a/media/apex/java/android/media/session/MediaController.java
+++ b/media/apex/java/android/media/session/MediaController.java
@@ -18,6 +18,7 @@ package android.media.session;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.SystemApi;
 import android.annotation.UnsupportedAppUsage;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -1011,6 +1012,7 @@ public final class MediaController {
         /**
          * @hide
          */
+        @SystemApi
         public PlaybackInfo(int type, int control, int max, int current, AudioAttributes attrs) {
             mVolumeType = type;
             mVolumeControl = control;