commit 1e54119f9bfbd976c7dd2b1b468fe7903b1c08d7
author Jan Sebechlebsky <jsebechlebsky@google.com> Thu Jan 12 10:16:56 2023 +0100
committer Jan Sebechlebsky <jsebechlebsky@google.com> Thu Jan 12 14:15:54 2023 +0100
tree 00695c9ff3e6a4e82ea2940d5e497421a0196c75
parent 99192f9f7cd6c42bec386aa45ffd4919b48ac5e9

Fix MediaPlayer construction with AUDIO_SESSION_ALLOCATE.

The cl modifies the native initizalization code, so it's possible
to pass explicit session id during construction of native MediaPlayer
instance (prior to this change, the native constructor would always
allocate new session id from audio server, even though in some cases it
might have been immediately changed to exliplicitly requested session id).

Bug: 263373078
Bug: 263362598
Test: atest MediaPlayerUnitTest
Test: atest CtsMediaAudioTestCases CtsMediaPlayerTestCases

Change-Id: Id3b52d6432a929ce5ce09f76fb7640857667358b

media/libmedia/include/media/mediaplayer.h

diff --git a/media/libmedia/include/media/mediaplayer.h b/media/libmedia/include/media/mediaplayer.h
index b45dae5..2f9b85e 100644
--- a/media/libmedia/include/media/mediaplayer.h
+++ b/media/libmedia/include/media/mediaplayer.h
@@ -214,7 +214,8 @@
 {
 public:
     explicit MediaPlayer(const android::content::AttributionSourceState& mAttributionSource =
-        android::content::AttributionSourceState());
+        android::content::AttributionSourceState(),
+        audio_session_t sessionId = AUDIO_SESSION_ALLOCATE);
     ~MediaPlayer();
             void            died();
             void            disconnect();

media/libmedia/mediaplayer.cpp

diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 5215c1b..b5c75b3 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -42,8 +42,8 @@
 using media::VolumeShaper;
 using content::AttributionSourceState;
 
-MediaPlayer::MediaPlayer(const AttributionSourceState& attributionSource)
-        : mAttributionSource(attributionSource)
+MediaPlayer::MediaPlayer(const AttributionSourceState& attributionSource,
+    const audio_session_t sessionId) : mAttributionSource(attributionSource)
 {
     ALOGV("constructor");
     mListener = NULL;
@@ -61,7 +61,12 @@
     mLeftVolume = mRightVolume = 1.0;
     mVideoWidth = mVideoHeight = 0;
     mLockThreadId = 0;
-    mAudioSessionId = (audio_session_t) AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);
+    if (sessionId == AUDIO_SESSION_ALLOCATE) {
+        mAudioSessionId = static_cast<audio_session_t>(
+            AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION));
+    } else {
+        mAudioSessionId = sessionId;
+    }
     AudioSystem::acquireAudioSessionId(mAudioSessionId, (pid_t)-1, (uid_t)-1); // always in client.
     mSendLevel = 0;
     mRetransmitEndpointValid = false;