loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing null check

Browse Source 
PiperOrigin-RevId: 640555113
This commit is contained in:
tonihei 2024-06-05 09:42:48 -07:00 committed by Copybara-Service
parent 438279a3a0
commit 9547828468
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/session/src/main/java/androidx/media3/session/legacy/MediaSessionCompat.java
View File

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