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

Merge "Null check for logicaldisplay" into sc-dev

Browse Source
This commit is contained in:
Fiona Campbell
2021-07-29 08:39:31 +00:00
committed by Android (Google) Code Review
parent 8b872f5c71 245cf10867
commit fca58882db
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

@@ -3285,6 +3285,9 @@ public final class DisplayManagerService extends SystemService {
synchronized (mSyncRoot) { synchronized (mSyncRoot) {
final LogicalDisplay display = mLogicalDisplayMapper.getDisplayLocked(displayId); final LogicalDisplay display = mLogicalDisplayMapper.getDisplayLocked(displayId);
if (display == null) {
return null;
}
final DisplayDevice device = display.getPrimaryDisplayDeviceLocked(); final DisplayDevice device = display.getPrimaryDisplayDeviceLocked();
if (device == null) { if (device == null) {
return null; return null;