diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-02 01:57:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-02 01:57:04 +0000 |
| commit | 7feac4ed47467117bb500dc2074474d8bf1aa016 (patch) | |
| tree | 23ab05dfcc41adbcd8d510254fe4cb4c56598c78 | |
| parent | c0fcd758c4e7c6e2c755e2fb1c01cb15c9e15c02 (diff) | |
| parent | 5a6696991ff34606aab2a327eb782cae45076682 (diff) | |
Merge "Fix flaky media key event related CTS tests" into rvc-dev
| -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); |