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

Commit a6b120af authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7157908 from 39745d82 to rvc-qpr3-release

Change-Id: I0291d34b28e855cb79e29f9ae3cef58d6a0f96de
parents fbec0d7b 39745d82
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -361,7 +361,12 @@ public class MediaRouter {
        }

        public Display[] getAllPresentationDisplays() {
            try {
                return mDisplayService.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION);
            } catch (RuntimeException ex) {
                Log.e(TAG, "Unable to get displays.", ex);
                return null;
            }
        }

        private void updatePresentationDisplays(int changedDisplayId) {
@@ -2075,6 +2080,9 @@ public class MediaRouter {
        private Display choosePresentationDisplay() {
            if ((mSupportedTypes & ROUTE_TYPE_LIVE_VIDEO) != 0) {
                Display[] displays = sStatic.getAllPresentationDisplays();
                if (displays == null || displays.length == 0) {
                    return null;
                }

                // Ensure that the specified display is valid for presentations.
                // This check will normally disallow the default display unless it was