From 245cf108676bcdca48c19a6e89cae37e219e9516 Mon Sep 17 00:00:00 2001
From: Fiona Campbell <flc@google.com>
Date: Wed, 28 Jul 2021 18:49:59 +0100
Subject: [PATCH] Null check for logicaldisplay

Ensure that the logical display is valid before calling getPrimaryDisplayDeviceLocked() on it first.

Bug: 194542389
Test: Manual
Change-Id: I788527a3cd02fcc12efe0b8d84e26d5d66f53762
---
 .../java/com/android/server/display/DisplayManagerService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index 7d06d6ea50fa6..afd18894f5312 100644
--- 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;