From 8e17db55543f4f9e9724527adc89934602ccfb49 Mon Sep 17 00:00:00 2001
From: Jaewan Kim <jaewan@google.com>
Date: Thu, 15 Mar 2018 16:16:51 +0900
Subject: [PATCH] MediaSession2: Remove
 MediaSession2#registerPlayerEventCallback()

Bug: 74157064
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: Ia976c0ebe9f2b7eff0ae603db96ab106aa045cbc
---
 media/java/android/media/MediaSession2.java   | 29 -------------------
 .../media/update/MediaSession2Provider.java   |  2 --
 2 files changed, 31 deletions(-)

diff --git a/media/java/android/media/MediaSession2.java b/media/java/android/media/MediaSession2.java
index 8008c658f3ea9..52c2375970cd6 100644
--- a/media/java/android/media/MediaSession2.java
+++ b/media/java/android/media/MediaSession2.java
@@ -1616,35 +1616,6 @@ public class MediaSession2 implements AutoCloseable {
         mProvider.notifyError_impl(errorCode, extras);
     }
 
-    /**
-     * Register {@link PlayerEventCallback} to listen changes in the underlying
-     * {@link MediaPlayerBase}, regardless of the change in the underlying player.
-     * <p>
-     * Registered callbacks will be also called when the underlying player is changed.
-     *
-     * @param executor a callback Executor
-     * @param callback a EventCallback
-     * @throws IllegalArgumentException if executor or callback is {@code null}.
-     * @hide
-     */
-    // TODO(jaewan): Remove (b/74157064)
-    public void registerPlayerEventCallback(@NonNull @CallbackExecutor Executor executor,
-            @NonNull PlayerEventCallback callback) {
-        mProvider.registerPlayerEventCallback_impl(executor, callback);
-    }
-
-    /**
-     * Unregister the previously registered {@link PlayerEventCallback}.
-     *
-     * @param callback the callback to be removed
-     * @throws IllegalArgumentException if the callback is {@code null}.
-     * @hide
-     */
-    // TODO(jaewan): Remove (b/74157064)
-    public void unregisterPlayerEventCallback(@NonNull PlayerEventCallback callback) {
-        mProvider.unregisterPlayerEventCallback_impl(callback);
-    }
-
     /**
      * Get the player state.
      *
diff --git a/media/java/android/media/update/MediaSession2Provider.java b/media/java/android/media/update/MediaSession2Provider.java
index 84ea369336d73..85de404ad08f3 100644
--- a/media/java/android/media/update/MediaSession2Provider.java
+++ b/media/java/android/media/update/MediaSession2Provider.java
@@ -68,8 +68,6 @@ public interface MediaSession2Provider extends TransportControlProvider {
     void setPlaylistParams_impl(PlaylistParams params);
     PlaylistParams getPlaylistParams_impl();
     void notifyError_impl(int errorCode, Bundle extras);
-    void registerPlayerEventCallback_impl(Executor executor, PlayerEventCallback callback);
-    void unregisterPlayerEventCallback_impl(PlayerEventCallback callback);
 
     interface CommandProvider {
         int getCommandCode_impl();