diff options
| author | 2020-07-02 02:15:26 +0000 | |
|---|---|---|
| committer | 2020-07-02 02:15:26 +0000 | |
| commit | 1d658df5e382e4649bdcce94a377dc0318f06063 (patch) | |
| tree | e76a129e39f3c5338119dac1755068657f6b93a7 | |
| parent | be48f1591ed00520661bdf1125a3073835cedcb0 (diff) | |
| parent | 7feac4ed47467117bb500dc2074474d8bf1aa016 (diff) | |
Merge "Fix flaky media key event related CTS tests" into rvc-dev am: 7feac4ed47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004926
Change-Id: I8ceaf8014bd761b801b60ea91d5c061accde5160
| -rw-r--r-- | apex/media/framework/java/android/media/MediaSession2.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/media/framework/java/android/media/MediaSession2.java b/apex/media/framework/java/android/media/MediaSession2.java index 081e76ab0215..6560afedab0f 100644 --- a/apex/media/framework/java/android/media/MediaSession2.java +++ b/apex/media/framework/java/android/media/MediaSession2.java @@ -404,7 +404,7 @@ public class MediaSession2 implements AutoCloseable { mCallback.onPostConnect(MediaSession2.this, controllerInfo); connected = true; } finally { - if (!connected) { + if (!connected || isClosed()) { if (DEBUG) { Log.d(TAG, "Rejecting connection or notifying that session is closed" + ", controllerInfo=" + controllerInfo); |