From ecdf034b87e546bcf2f34a362972084688835aab Mon Sep 17 00:00:00 2001
From: Insun Kang <insun@google.com>
Date: Sat, 27 Jan 2018 01:46:05 +0900
Subject: [PATCH] MediaSession2 API set for audio focus handling

MediaPlayerInterface has:
- setAudioAttributes
- getAudioAttributes

MediaSession2 has:
- setAudioFocusRequest

Test: build
Bug: 72529899
Change-Id: I3b200198bc44c568d3c06583c23d9918c6380e32
---
 media/java/android/media/MediaPlayerInterface.java | 14 ++++++++++++++
 media/java/android/media/MediaSession2.java        |  9 ---------
 .../media/update/MediaSession2Provider.java        |  1 -
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/media/java/android/media/MediaPlayerInterface.java b/media/java/android/media/MediaPlayerInterface.java
index 51bcd9b8a56a8..715284d075209 100644
--- a/media/java/android/media/MediaPlayerInterface.java
+++ b/media/java/android/media/MediaPlayerInterface.java
@@ -16,6 +16,8 @@
 
 package android.media;
 
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.media.MediaSession2.PlaylistParams;
 
 import java.util.List;
@@ -48,6 +50,18 @@ public interface MediaPlayerInterface {
     void rewind();
 
     PlaybackState2 getPlaybackState();
+
+    /**
+     * Sets the {@link AudioAttributes} to be used during the playback of the media.
+     *
+     * @param attributes non-null <code>AudioAttributes</code>.
+     */
+    void setAudioAttributes(@NonNull AudioAttributes attributes);
+
+    /**
+     * Returns AudioAttributes that media player has.
+     */
+    @Nullable
     AudioAttributes getAudioAttributes();
 
     void setPlaylist(List<MediaItem2> item, PlaylistParams param);
diff --git a/media/java/android/media/MediaSession2.java b/media/java/android/media/MediaSession2.java
index cf37b779b6c44..fffc3151d205b 100644
--- a/media/java/android/media/MediaSession2.java
+++ b/media/java/android/media/MediaSession2.java
@@ -1079,15 +1079,6 @@ public class MediaSession2 implements AutoCloseable {
         return mProvider.getConnectedControllers_impl();
     }
 
-    /**
-     * Sets the {@link AudioAttributes} to be used during the playback of the video.
-     *
-     * @param attributes non-null <code>AudioAttributes</code>.
-     */
-    public void setAudioAttributes(@NonNull AudioAttributes attributes) {
-        mProvider.setAudioAttributes_impl(attributes);
-    }
-
     /**
      * Sets which type of audio focus will be requested during the playback, or configures playback
      * to not request audio focus. Valid values for focus requests are
diff --git a/media/java/android/media/update/MediaSession2Provider.java b/media/java/android/media/update/MediaSession2Provider.java
index 215fda43c8121..62e2207cac48b 100644
--- a/media/java/android/media/update/MediaSession2Provider.java
+++ b/media/java/android/media/update/MediaSession2Provider.java
@@ -46,7 +46,6 @@ public interface MediaSession2Provider extends TransportControlProvider {
     SessionToken2 getToken_impl();
     List<ControllerInfo> getConnectedControllers_impl();
     void setCustomLayout_impl(ControllerInfo controller, List<CommandButton> layout);
-    void setAudioAttributes_impl(AudioAttributes attributes);
     void setAudioFocusRequest_impl(int focusGain);
 
     void setAllowedCommands_impl(ControllerInfo controller, CommandGroup commands);