From b4689ed97f85f92d466702b8b81956c189606ce3 Mon Sep 17 00:00:00 2001
From: Insun Kang <insun@google.com>
Date: Fri, 26 Jan 2018 21:24:19 +0900
Subject: [PATCH] MediaSession2 API set for audio focus handling

MediaPlayerInterface has:
- setAudioAttributes
- getAudioAttributes

MediaSession2 has:
- setAudioFocusRequest

Test: build
Bug: 72529899
Change-Id: I64b0238791f25bfd07138686166521a76bc36230
---
 media/java/android/media/MediaPlayerInterface.java         | 14 ++++++++++++++
 media/java/android/media/MediaSession2.java                |  9 ---------
 media/java/android/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 5ff8a581f5f9..37ad8abc0c77 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 8c499c873d9b..2a047bd14fe5 100644
--- a/media/java/android/media/MediaSession2.java
+++ b/media/java/android/media/MediaSession2.java
@@ -1074,15 +1074,6 @@ public class MediaSession2 implements AutoCloseable {
     }
 
     /**
-     * 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
      * {@link AudioManager#AUDIOFOCUS_GAIN}, {@link AudioManager#AUDIOFOCUS_GAIN_TRANSIENT},
diff --git a/media/java/android/media/update/MediaSession2Provider.java b/media/java/android/media/update/MediaSession2Provider.java
index d340245c0e81..da5a8bd5d4c0 100644
--- a/media/java/android/media/update/MediaSession2Provider.java
+++ b/media/java/android/media/update/MediaSession2Provider.java
@@ -42,7 +42,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);
-- 
2.11.0