am 2c4643dd: Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev

* commit '2c4643dd802d18ca0088fa860076fe917c69335f': Fixed issue with using wrong display id when creating context for displays
2015-06-09 23:13:54 +00:00
parent 8693fc6f61 2c4643dd80
commit d43ee1260e
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) {