diff options
| author | Santiago Seifert <aquilescanta@google.com> | 2023-08-07 16:15:39 +0000 |
|---|---|---|
| committer | Santiago Seifert <aquilescanta@google.com> | 2023-08-18 10:01:32 +0000 |
| commit | 3cfa79c53cf9e10cecb93a62d25507bb45da08b0 (patch) | |
| tree | 8b76c121cc8cc08e97f9fea1f0ef8db79f99fdaf | |
| parent | b2c9ba11d3c7cbcff95cd9408f614ce3e9a4ff07 (diff) | |
| download | base-3cfa79c53cf9e10cecb93a62d25507bb45da08b0.tar.gz | |
Remove callback upon MediaSession#release
This change prevents all callbacks from MediaSession after
the app calls MediaSession#release. Concretely, this change
fixes flakiness in MediaControllerTest, where the callback
implementation tries to access the media session after its
corresponding field has been set to null.
Bug: 294178159
Bug: 283873741
Test: atest CtsMediaBetterTogetherTestCases
Change-Id: I112fa5df6aafdb2774ed65c2d08ab1eb680e6b47
(cherry picked from commit 9452bb9fe40d4c4b4354aaae0202cf85f7fe45f1)
Merged-In: I112fa5df6aafdb2774ed65c2d08ab1eb680e6b47
| -rw-r--r-- | media/java/android/media/session/MediaSession.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java index 29e8716f08ac..cda919f14bc6 100644 --- a/media/java/android/media/session/MediaSession.java +++ b/media/java/android/media/session/MediaSession.java @@ -442,6 +442,7 @@ public final class MediaSession { * but it must be released if your activity or service is being destroyed. */ public void release() { + setCallback(null); try { mBinder.destroySession(); } catch (RemoteException e) { |