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

Commit 710e3ecb authored by Winson's avatar Winson
Browse files

Revert ContextImpl LoadedApk packageInfo caching workaround 

Reverts changes made for b/120987987 that are no longer necessary
with changes for b/124363683.

Test: manually built, enabled/disabled FontCursiveMonospaceOverlay

Change-Id: Ied18a412d30514b40cc720d9a1af5c0d2053d795
parent b0085ce5

core/java/android/app/ContextImpl.java

+8 −13
Original line number Diff line number Diff line
@@ -2122,8 +2122,7 @@ class ContextImpl extends Context { 
    }



    private static Resources createResources(IBinder activityToken, LoadedApk pi, String splitName,

            int displayId, Configuration overrideConfig, CompatibilityInfo compatInfo,

            String[] overlayDirs) {

            int displayId, Configuration overrideConfig, CompatibilityInfo compatInfo) {

        final String[] splitResDirs;

        final ClassLoader classLoader;

        try {
@@ -2135,7 +2134,7 @@ class ContextImpl extends Context { 
        return ResourcesManager.getInstance().getResources(activityToken,

                pi.getResDir(),

                splitResDirs,

                overlayDirs,

                pi.getOverlayDirs(),

                pi.getApplicationInfo().sharedLibraryFiles,

                displayId,

                overrideConfig,
@@ -2153,11 +2152,9 @@ class ContextImpl extends Context { 
                    new UserHandle(UserHandle.getUserId(application.uid)), flags, null, null);



            final int displayId = getDisplayId();

            // overlayDirs is retrieved directly from ApplicationInfo since ActivityThread may have

            // a LoadedApk containing Resources with stale overlays for a remote application.

            final String[] overlayDirs = application.resourceDirs;



            c.setResources(createResources(mActivityToken, pi, null, displayId, null,

                    getDisplayAdjustments(displayId).getCompatibilityInfo(), overlayDirs));

                    getDisplayAdjustments(displayId).getCompatibilityInfo()));

            if (c.mResources != null) {

                return c;

            }
@@ -2192,7 +2189,7 @@ class ContextImpl extends Context { 
            final int displayId = getDisplayId();



            c.setResources(createResources(mActivityToken, pi, null, displayId, null,

                    getDisplayAdjustments(displayId).getCompatibilityInfo(), pi.getOverlayDirs()));

                    getDisplayAdjustments(displayId).getCompatibilityInfo()));

            if (c.mResources != null) {

                return c;

            }
@@ -2242,8 +2239,7 @@ class ContextImpl extends Context { 


        final int displayId = getDisplayId();

        context.setResources(createResources(mActivityToken, mPackageInfo, mSplitName, displayId,

                overrideConfiguration, getDisplayAdjustments(displayId).getCompatibilityInfo(),

                mPackageInfo.getOverlayDirs()));

                overrideConfiguration, getDisplayAdjustments(displayId).getCompatibilityInfo()));

        return context;

    }
@@ -2258,8 +2254,7 @@ class ContextImpl extends Context { 


        final int displayId = display.getDisplayId();

        context.setResources(createResources(mActivityToken, mPackageInfo, mSplitName, displayId,

                null, getDisplayAdjustments(displayId).getCompatibilityInfo(),

                mPackageInfo.getOverlayDirs()));

                null, getDisplayAdjustments(displayId).getCompatibilityInfo()));

        context.mDisplay = display;

        return context;

    }
@@ -2441,7 +2436,7 @@ class ContextImpl extends Context { 
        ContextImpl context = new ContextImpl(null, systemContext.mMainThread, packageInfo, null,

                null, null, 0, null, null);

        context.setResources(createResources(null, packageInfo, null, displayId, null,

                packageInfo.getCompatibilityInfo(), packageInfo.getOverlayDirs()));

                packageInfo.getCompatibilityInfo()));

        context.updateDisplay(displayId);

        return context;

    }