Merge "Null check for logicaldisplay" into sc-dev

2021-07-29 08:39:31 +00:00
parent 8b872f5c71 245cf10867
commit fca58882db
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -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;