summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hyundo Moon <hdmoon@google.com> 2019-03-12 17:05:27 +0900
committer Hyundo Moon <hdmoon@google.com> 2019-03-12 17:57:00 +0900
commit888e5a4fb0f940a1fa86fe6771a8aae75d7d7638 (patch)
tree1a08eb453d28b40de615f27a3288a72eb7070448
parentfc0fbbb3af201499c5df7e8d7b813f336bdc2078 (diff)
Hide constructor of MediaController#PlaybackInfo
This CL reverts the API change introduced by "1dfec66: Make hidden constructor of PlaybackInfo as @SystemApi" Bug: 128245348 Test: atest CtsMediaTestCases:android.media.cts.MediaSessionTest; atest CtsMediaTestCases:android.media.cts.MediaControllerTest; atest CtsMediaTestCases:android.media.cts.MediaBrowserTest; Change-Id: I6deeb048d6d209baa085792edf5ef2fdd8bb1d7c
-rw-r--r--api/system-current.txt4
-rw-r--r--media/java/android/media/session/MediaController.java2
2 files changed, 0 insertions, 6 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index b2030ec8a911..bd7b92a539b3 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -3722,10 +3722,6 @@ package android.media.audiopolicy {
package android.media.session {
- public static final class MediaController.PlaybackInfo implements android.os.Parcelable {
- ctor public MediaController.PlaybackInfo(int, int, int, int, android.media.AudioAttributes);
- }
-
public final class MediaSessionManager {
method @RequiresPermission(android.Manifest.permission.SET_MEDIA_KEY_LISTENER) public void setOnMediaKeyListener(android.media.session.MediaSessionManager.OnMediaKeyListener, @Nullable android.os.Handler);
method @RequiresPermission(android.Manifest.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER) public void setOnVolumeKeyLongPressListener(android.media.session.MediaSessionManager.OnVolumeKeyLongPressListener, @Nullable android.os.Handler);
diff --git a/media/java/android/media/session/MediaController.java b/media/java/android/media/session/MediaController.java
index 5ee52ce08d10..73340441c706 100644
--- a/media/java/android/media/session/MediaController.java
+++ b/media/java/android/media/session/MediaController.java
@@ -18,7 +18,6 @@ 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;
@@ -954,7 +953,6 @@ public final class MediaController {
/**
* @hide
*/
- @SystemApi
public PlaybackInfo(int type, int control, int max, int current, AudioAttributes attrs) {
mVolumeType = type;
mVolumeControl = control;