Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wale Ogunwale
2015-06-09 23:01:02 +00:00
committed by Android (Google) Code Review
parent 475c545fa8 cac3dc636d
commit 2c4643dd80
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/ContextImpl.java
View File

@@ -1745,7 +1745,8 @@ class ContextImpl extends Context {
mResourcesManager = ResourcesManager.getInstance(); mResourcesManager = ResourcesManager.getInstance();
final int displayId = (createDisplayWithId != Display.INVALID_DISPLAY) final int displayId = (createDisplayWithId != Display.INVALID_DISPLAY)
? createDisplayWithId : getDisplayId(); ? createDisplayWithId
: (display != null) ? display.getDisplayId() : Display.DEFAULT_DISPLAY;
CompatibilityInfo compatInfo = null; CompatibilityInfo compatInfo = null;
if (container != null) { if (container != null) {