diff options
| author | 2020-07-02 02:55:12 +0000 | |
|---|---|---|
| committer | 2020-07-02 02:55:12 +0000 | |
| commit | 52ca68f229a2baec1c6bcd12eaea8a7dfeeafa3d (patch) | |
| tree | 2c3db17fa935b8dd212c430c32e2880dd2f2c4cd | |
| parent | 54cb7ac7ea4673bacdab5665cf73884ab221dfc6 (diff) | |
| parent | 87bd6eff7105d57243a66e7219fe69f52980d21d (diff) | |
Merge "Fix flaky media key event related CTS tests" into rvc-dev am: 7feac4ed47 am: 1d658df5e3 am: f032d382ee am: 87bd6eff71
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004926
Change-Id: Ie976d07aa5d2b9b4dc917413fb01ae6c5f0a5347
| -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); |