From 3de3b87b33b7324f9926587972f76bf436e1b43c Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Sat, 13 Feb 2021 13:23:58 +0100
Subject: [PATCH] MediaPlayer: optimize audio session update

Do not call PlayerBase baseUpdateSessionId() when
the session ID is set from the constructor.

Bug: 179772484
Test: make
Change-Id: I4e7db14410c8beb98e54c6373f0ca14835ab34b7
---
 media/java/android/media/MediaPlayer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index ca0d29f2f47f1..b7ac793cb6bc3 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -921,7 +921,7 @@ public class MediaPlayer extends PlayerBase
             final AudioAttributes aa = audioAttributes != null ? audioAttributes :
                 new AudioAttributes.Builder().build();
             mp.setAudioAttributes(aa);
-            mp.setAudioSessionId(audioSessionId);
+            mp.native_setAudioSessionId(audioSessionId);
             mp.setDataSource(context, uri);
             if (holder != null) {
                 mp.setDisplay(holder);
@@ -987,7 +987,7 @@ public class MediaPlayer extends PlayerBase
             final AudioAttributes aa = audioAttributes != null ? audioAttributes :
                 new AudioAttributes.Builder().build();
             mp.setAudioAttributes(aa);
-            mp.setAudioSessionId(audioSessionId);
+            mp.native_setAudioSessionId(audioSessionId);
 
             mp.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
             afd.close();