From cac3dc636d8b838bcdad7e07e4f66795bf654a95 Mon Sep 17 00:00:00 2001
From: Wale Ogunwale <ogunwale@google.com>
Date: Tue, 9 Jun 2015 15:35:02 -0700
Subject: [PATCH] Fixed issue with using wrong display id when creating context
 for displays

Bug: 21729214
Change-Id: I58b6712e2929e758c3fc3b2d493991ba0262dec9
---
 core/java/android/app/ContextImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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) {