Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c4643dd authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

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

parents 475c545f cac3dc63

core/java/android/app/ContextImpl.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -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) {