Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix flaky media key event related CTS tests" into rvc-dev am: 7feac4ed47 am: 1d658df5e3 am: f032d382ee

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004926

Change-Id: Idadfd4fe31b2be02c0aa73a89a52b599ea5e161b
This commit is contained in:
TreeHugger Robot
2020-07-02 02:39:03 +00:00
committed by Automerger Merge Worker
parent dbb2bdda63 f032d382ee
commit 87bd6eff71
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/media/framework/java/android/media/MediaSession2.java
View File

@@ -404,7 +404,7 @@ public class MediaSession2 implements AutoCloseable {
mCallback.onPostConnect(MediaSession2.this, controllerInfo); mCallback.onPostConnect(MediaSession2.this, controllerInfo);
connected = true; connected = true;
} finally { } finally {
if (!connected) { if (!connected || isClosed()) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Rejecting connection or notifying that session is closed" Log.d(TAG, "Rejecting connection or notifying that session is closed"
+ ", controllerInfo=" + controllerInfo); + ", controllerInfo=" + controllerInfo);