Fixed issue with using wrong display id when creating context for displays

Bug: 21729214 Change-Id: I58b6712e2929e758c3fc3b2d493991ba0262dec9
2015-06-09 15:35:02 -07:00
parent 6f024937c1
commit cac3dc636d
1 changed files with 2 additions and 1 deletions
--- 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) {