Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 408cff12 authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge "Null check for logicaldisplay" into sc-dev am: fca58882 

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

Change-Id: I1bf201b3d9e0cec56c22388a0d2a2a4118fac524
parents 000c1760 fca58882

services/core/java/com/android/server/display/DisplayManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -3285,6 +3285,9 @@ public final class DisplayManagerService extends SystemService { 


            synchronized (mSyncRoot) {

                final LogicalDisplay display = mLogicalDisplayMapper.getDisplayLocked(displayId);

                if (display == null) {

                    return null;

                }

                final DisplayDevice device = display.getPrimaryDisplayDeviceLocked();

                if (device == null) {

                    return null;