commit 05b29848535881134c91a01728cf9c71f8c0e921
author Vladimir Komsiyski <vladokom@google.com> Wed Nov 27 12:07:01 2024 +0000
committer Vladimir Komsiyski <vladokom@google.com> Wed Nov 27 12:07:01 2024 +0000
tree 8b03d19d965d9ce3d04e378ed14784932fa4a52e
parent c3337e29f7cd32e7949d44daa711d6f5a23b27b8

Fix NPE when creating mirror displays w/o VDM

Change-Id: I1d077a9f07c0d397531e5f5ad8697ff765b4a7c9
Fix: 381209992
Test: presubmit
Flag: N/A bugfix

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

diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index c3cb913..0e5fc41 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -1682,7 +1682,7 @@
             return checkCallingPermission(ADD_MIRROR_DISPLAY, "canCreateMirrorDisplays");
         }
         try {
-            return virtualDevice.canCreateMirrorDisplays();
+            return virtualDevice != null && virtualDevice.canCreateMirrorDisplays();
         } catch (RemoteException e) {
             Slog.e(TAG, "Unable to query virtual device for permissions", e);
             return false;