Merge "Fix BT keeping wrong state issue"

am: 7cd490c941 Change-Id: Ia7bb390fb8e90d9fd434b1988fbf2ca66c3e425e
2019-04-05 02:39:19 -07:00
parent 47c803e334 7cd490c941
commit 4f73919dd7
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);