Catch RuntimeException from DisplayManager am: 1901401be2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13566538 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I010bfdfff6baa82c1108623daa3403798f9966e9
2021-02-19 07:06:19 +00:00
parent 54eb0df0b1 1901401be2
commit 4beb1c5239
1 changed files with 6 additions and 1 deletions
--- a/media/java/android/media/MediaRouter.java
+++ b/media/java/android/media/MediaRouter.java
@@ -384,7 +384,12 @@ public class MediaRouter {
        }

        public Display[] getAllPresentationDisplays() {
-            return mDisplayService.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION);
+            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) {