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 am: fca58882db

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403077

Change-Id: I8f0d0993eef4ddfb612215c042239a72323af448
This commit is contained in:
Fiona Campbell
2021-07-30 00:45:54 +00:00
committed by Automerger Merge Worker
parent 357769d696 fca58882db
commit 3030b865bb
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;