commit 0bbdb71a121566eecb8d7125403be0bdca9c5e93
author Jan Sebechlebsky <jsebechlebsky@google.com> Mon Jan 09 14:29:19 2023 +0100
committer Jan Sebechlebsky <jsebechlebsky@google.com> Thu Jan 12 14:15:17 2023 +0100
tree 53f0a91b8cde1bedf2e2dea67764ddcbdb514553
parent 714a0f9067d04b94c796d287c3f928c4edc03376

Fix MediaPlayer construction with AUDIO_SESSION_ALLOCATE.

When AUDIO_SESSION_ALLOCATE is used during construction, the media
player should allocate new unique session id. However, the previous
call to native_set_session id tried to acquire session_id with value 0,
which correspond to restricted OUTPUT_MIX session and caused failure
during initialization.

The topic also 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: I92b085e23c72e0b9d21e12792bf67c2497aa0e25

media/jni/android_media_MediaPlayer.cpp

diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index da920bb..9552200 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -956,14 +956,16 @@
 
 static void
 android_media_MediaPlayer_native_setup(JNIEnv *env, jobject thiz, jobject weak_this,
-                                       jobject jAttributionSource)
+                                       jobject jAttributionSource,
+                                       jint jAudioSessionId)
 {
     ALOGV("native_setup");
 
     Parcel* parcel = parcelForJavaObject(env, jAttributionSource);
     android::content::AttributionSourceState attributionSource;
     attributionSource.readFromParcel(parcel);
-    sp<MediaPlayer> mp = sp<MediaPlayer>::make(attributionSource);
+    sp<MediaPlayer> mp = sp<MediaPlayer>::make(
+        attributionSource, static_cast<audio_session_t>(jAudioSessionId));
     if (mp == NULL) {
         jniThrowException(env, "java/lang/RuntimeException", "Out of memory");
         return;
@@ -1419,7 +1421,9 @@
     {"native_setMetadataFilter", "(Landroid/os/Parcel;)I",      (void *)android_media_MediaPlayer_setMetadataFilter},
     {"native_getMetadata", "(ZZLandroid/os/Parcel;)Z",          (void *)android_media_MediaPlayer_getMetadata},
     {"native_init",         "()V",                              (void *)android_media_MediaPlayer_native_init},
-    {"native_setup",        "(Ljava/lang/Object;Landroid/os/Parcel;)V",(void *)android_media_MediaPlayer_native_setup},
+    {"native_setup",
+        "(Ljava/lang/Object;Landroid/os/Parcel;I)V",
+        (void *)android_media_MediaPlayer_native_setup},
     {"native_finalize",     "()V",                              (void *)android_media_MediaPlayer_native_finalize},
     {"getAudioSessionId",   "()I",                              (void *)android_media_MediaPlayer_get_audio_session_id},
     {"native_setAudioSessionId",   "(I)V",                      (void *)android_media_MediaPlayer_set_audio_session_id},