Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a1559dc authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "MediaPlayer: optimize audio session update" into sc-dev am: 4b1d7b37 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13562389

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb31e6368392a773726ecbc0b572e1b7f5447529
parents d5dbe758 4b1d7b37

media/java/android/media/MediaPlayer.java

+2 −2
Original line number Diff line number Diff line
@@ -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();