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

Commit 9cf99544 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Set compatInfo to default if unset in ContextImpl constructor. 

Will cause NPE when ResourceManager.getTopLevelResources() is called
if unset.

Bug: 19427781
Change-Id: I8c990cc425025cf426a87cac9dede09a14aa640c
parent 6c770900

core/java/android/app/ContextImpl.java

+4 −2
Original line number Diff line number Diff line
@@ -2294,8 +2294,10 @@ class ContextImpl extends Context { 
        if (container != null) {

            compatInfo = container.getDisplayAdjustments(displayId).getCompatibilityInfo();

        }

        if (compatInfo == null && displayId == Display.DEFAULT_DISPLAY) {

            compatInfo = packageInfo.getCompatibilityInfo();

        if (compatInfo == null) {

            compatInfo = (displayId == Display.DEFAULT_DISPLAY)

                    ? packageInfo.getCompatibilityInfo()

                    : CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO;

        }

        mDisplayAdjustments.setCompatibilityInfo(compatInfo);

        mDisplayAdjustments.setConfiguration(overrideConfiguration);