diff options
| author | 2015-06-09 15:35:02 -0700 | |
|---|---|---|
| committer | 2015-06-09 15:35:02 -0700 | |
| commit | cac3dc636d8b838bcdad7e07e4f66795bf654a95 (patch) | |
| tree | 32db7331514436ad8cd9e6fcf1ec6e234f40cbea | |
| parent | 6f024937c11bd9e1ad0aa2ab9ae05e14eae5063a (diff) | |
Fixed issue with using wrong display id when creating context for displays
Bug: 21729214
Change-Id: I58b6712e2929e758c3fc3b2d493991ba0262dec9
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 829b0984ea45..be36af7dab16 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) { |