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

[DO NOT MERGE] Catch RuntimeException from DisplayManager

Browse Source 
Bug: 171714761
Test: build
Change-Id: I5bad08dcf49472af16df18418102407be56e67e7
This commit is contained in:
Sungsoo Lim
2021-02-15 15:53:07 +09:00
parent 087715166a
commit 39745d829c
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/java/android/media/MediaRouter.java
View File

@@ -361,7 +361,12 @@ public class MediaRouter {
} }
public Display[] getAllPresentationDisplays() { 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) { private void updatePresentationDisplays(int changedDisplayId) {
@@ -2075,6 +2080,9 @@ public class MediaRouter {
private Display choosePresentationDisplay() { private Display choosePresentationDisplay() {
if ((mSupportedTypes & ROUTE_TYPE_LIVE_VIDEO) != 0) { if ((mSupportedTypes & ROUTE_TYPE_LIVE_VIDEO) != 0) {
Display[] displays = sStatic.getAllPresentationDisplays(); Display[] displays = sStatic.getAllPresentationDisplays();
if (displays == null || displays.length == 0) {
return null;
}
// Ensure that the specified display is valid for presentations. // Ensure that the specified display is valid for presentations.
// This check will normally disallow the default display unless it was // This check will normally disallow the default display unless it was