Merge "Fix BT keeping wrong state issue"

2019-04-05 09:26:21 +00:00
parent 66d744ba74 8c7e263518
commit 7cd490c941
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/media/MediaSessionRecord.java
+++ b/services/core/java/com/android/server/media/MediaSessionRecord.java
@@ -669,6 +669,9 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
        PlaybackState state;
        long duration = -1;
        synchronized (mLock) {
+            if (mDestroyed) {
+                return null;
+            }
            state = mPlaybackState;
            if (mMetadata != null && mMetadata.containsKey(MediaMetadata.METADATA_KEY_DURATION)) {
                duration = mMetadata.getLong(MediaMetadata.METADATA_KEY_DURATION);