diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-09 13:05:02 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-09 13:05:02 +0000 |
commit | 9a3200930968321a37ba20c2f4b0895f0ccd0025 (patch) | |
tree | 046b01885828a2f29163936644cf82a058d29472 | |
parent | 5ece61dfdbc86ccec87e2ae0a42f737899365d2e (diff) | |
parent | f2dc4205bd753f6ac58c7798ad8a9df9f0e7da4f (diff) | |
download | Media-aml_hef_341311010.tar.gz |
Snap for 10632790 from f2dc4205bd753f6ac58c7798ad8a9df9f0e7da4f to mainline-healthfitness-releaseaml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030android14-mainline-healthfitness-release
Change-Id: I3ee7f925fae02d24580bbaa4abd1e9a376f50e8b
-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); } } |