Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 773aad98 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix flaky media key event related CTS tests" into rvc-dev am: 7feac4ed am: 1d658df5 

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

Change-Id: I0e7fde049b5717cda0ae17816005ed8afc1b54d1
parents 0d1eeaad 1d658df5

apex/media/framework/java/android/media/MediaSession2.java

+1 −1
Original line number Diff line number Diff line
@@ -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);