commit dcad040a9e5c357fa7345bbf0070ba7dd47608ed
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 27 13:38:49 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 27 13:38:49 2024 +0000
tree 597cc69fe498f033dca7ec075215a45b4f696667
parent f2779a3f7282febbc2c3724125f6c1053650a953
parent 05b29848535881134c91a01728cf9c71f8c0e921

Merge "Fix NPE when creating mirror displays w/o VDM" into main

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;