diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java index a8c16c769b91e..ac3e915041164 100644 --- a/services/core/java/com/android/server/media/MediaSessionRecord.java +++ b/services/core/java/com/android/server/media/MediaSessionRecord.java @@ -729,6 +729,9 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { PlaybackState state; long duration; synchronized (mLock) { + if (mDestroyed) { + return null; + } state = mPlaybackState; duration = mDuration; }