diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-15 09:35:39 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-15 09:35:39 +0000 |
commit | 4d84de9392868061a0e2cbe3a8eb6f8e5cdb37e2 (patch) | |
tree | 046b01885828a2f29163936644cf82a058d29472 | |
parent | 402f64643d4570ab54b8c7d433cfd8fcc9328733 (diff) | |
parent | f2dc4205bd753f6ac58c7798ad8a9df9f0e7da4f (diff) | |
download | Media-aml_tz5_341510010.tar.gz |
Snap for 11224086 from f2dc4205bd753f6ac58c7798ad8a9df9f0e7da4f to mainline-tzdata5-releaseaml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010
Change-Id: Iff96d7201c9a35a0ee009219f28c126e7efb3b63
-rw-r--r-- | apex/service/java/com/android/server/media/MediaCommunicationService.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/apex/service/java/com/android/server/media/MediaCommunicationService.java b/apex/service/java/com/android/server/media/MediaCommunicationService.java index b88e586..3ebb40b 100644 --- a/apex/service/java/com/android/server/media/MediaCommunicationService.java +++ b/apex/service/java/com/android/server/media/MediaCommunicationService.java @@ -272,20 +272,15 @@ public class MediaCommunicationService extends SystemService { } } - void onSessionDied(Session2Record session) { + private void removeSessionRecord(Session2Record session) { if (DEBUG) { - Log.d(TAG, "Destroying " + session); - } - if (session.isClosed()) { - Log.w(TAG, "Destroying already destroyed session. Ignoring."); - return; + Log.d(TAG, "Removing " + session); } FullUserRecord user = session.getFullUser(); if (user != null) { user.removeSession(session); } - session.close(); } void onSessionPlaybackStateChanged(Session2Record session, boolean promotePriority) { @@ -681,10 +676,13 @@ public class MediaCommunicationService extends SystemService { } synchronized (mSession2RecordLock) { mIsConnected = false; + // As per onDisconnected documentation, we do not need to call close() after + // onDisconnected is called. + mIsClosed = true; } MediaCommunicationService service = mServiceRef.get(); if (service != null) { - service.onSessionDied(Session2Record.this); + service.removeSessionRecord(Session2Record.this); } } |