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

Merge "Fix NPE when passing displayId through handler" into sc-v2-dev

Browse Source
This commit is contained in:
Fiona Campbell
2021-09-14 13:30:51 +00:00
committed by Android (Google) Code Review
parent e8af787674 489b25e7e9
commit d9dede17af
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2252,6 +2252,9 @@ public final class DisplayManagerService extends SystemService {
int displayId = msg.arg1; int displayId = msg.arg1;
final LogicalDisplay display = final LogicalDisplay display =
mLogicalDisplayMapper.getDisplayLocked(displayId); mLogicalDisplayMapper.getDisplayLocked(displayId);
if (display == null) {
break;
}
uids = display.getPendingFrameRateOverrideUids(); uids = display.getPendingFrameRateOverrideUids();
display.clearPendingFrameRateOverrideUids(); display.clearPendingFrameRateOverrideUids();
} }