Merge "Fix flaky media key event related CTS tests" into rvc-dev

2020-07-02 01:57:04 +00:00
parent c0fcd758c4 5a6696991f
commit 7feac4ed47
1 changed files with 1 additions and 1 deletions
--- 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);