From 9547828468b9ccff306fbf6df620a27a150471b4 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 5 Jun 2024 09:42:48 -0700
Subject: [PATCH] Add missing null check

PiperOrigin-RevId: 640555113
---
 .../media3/session/legacy/MediaSessionCompat.java        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libraries/session/src/main/java/androidx/media3/session/legacy/MediaSessionCompat.java b/libraries/session/src/main/java/androidx/media3/session/legacy/MediaSessionCompat.java
index 11d65531b5..bb9efe4a66 100644
--- a/libraries/session/src/main/java/androidx/media3/session/legacy/MediaSessionCompat.java
+++ b/libraries/session/src/main/java/androidx/media3/session/legacy/MediaSessionCompat.java
@@ -67,6 +67,7 @@ import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
+import androidx.media3.common.util.NullableType;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.session.legacy.MediaSessionManager.RemoteUserInfo;
 import androidx.versionedparcelable.ParcelUtils;
@@ -4205,7 +4206,7 @@ public class MediaSessionCompat {
 
     private static class ExtraSession extends IMediaSession.Stub {
 
-      private final AtomicReference<MediaSessionImplApi21> mMediaSessionImplRef;
+      private final AtomicReference<@NullableType MediaSessionImplApi21> mMediaSessionImplRef;
 
       ExtraSession(MediaSessionImplApi21 mediaSessionImpl) {
         mMediaSessionImplRef = new AtomicReference<>(mediaSessionImpl);
@@ -4277,9 +4278,9 @@ public class MediaSessionCompat {
       @Override
       public Bundle getSessionInfo() {
         MediaSessionImplApi21 mediaSessionImpl = mMediaSessionImplRef.get();
-        return mediaSessionImpl.mSessionInfo == null
-            ? null
-            : new Bundle(mediaSessionImpl.mSessionInfo);
+        return mediaSessionImpl != null && mediaSessionImpl.mSessionInfo != null
+            ? new Bundle(mediaSessionImpl.mSessionInfo)
+            : null;
       }
 
       @Override