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

Merge "DisplayModeService: check for null before accessing display mode" into sc-dev

Browse Source
This commit is contained in:
Ady Abraham
2021-06-29 15:52:12 +00:00
committed by Android (Google) Code Review
parent b0770ecb76 0a65f0efbf
commit 7fc7f6bcb6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/display/DisplayManagerService.java
View File

@@ -1528,8 +1528,14 @@ public final class DisplayManagerService extends SystemService {
if (requestedModeId == 0 && requestedRefreshRate != 0) { if (requestedModeId == 0 && requestedRefreshRate != 0) {
// Scan supported modes returned by display.getInfo() to find a mode with the same // Scan supported modes returned by display.getInfo() to find a mode with the same
// size as the default display mode but with the specified refresh rate instead. // size as the default display mode but with the specified refresh rate instead.
requestedModeId = display.getDisplayInfoLocked().findDefaultModeByRefreshRate( Display.Mode mode = display.getDisplayInfoLocked().findDefaultModeByRefreshRate(
requestedRefreshRate).getModeId(); requestedRefreshRate);
if (mode != null) {
requestedModeId = mode.getModeId();
} else {
Slog.e(TAG, "Couldn't find a mode for the requestedRefreshRate: "
+ requestedRefreshRate + " on Display: " + displayId);
}
} }
mDisplayModeDirector.getAppRequestObserver().setAppRequest( mDisplayModeDirector.getAppRequestObserver().setAppRequest(
displayId, requestedModeId, requestedMaxRefreshRate); displayId, requestedModeId, requestedMaxRefreshRate);