diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 829b0984ea456..be36af7dab164 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -1745,7 +1745,8 @@ class ContextImpl extends Context {
         mResourcesManager = ResourcesManager.getInstance();
 
         final int displayId = (createDisplayWithId != Display.INVALID_DISPLAY)
-                ? createDisplayWithId : getDisplayId();
+                ? createDisplayWithId
+                : (display != null) ? display.getDisplayId() : Display.DEFAULT_DISPLAY;
 
         CompatibilityInfo compatInfo = null;
         if (container != null) {