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

Commit 77e95892 authored by Narayan Kamath's avatar Narayan Kamath Committed by Richard Uhler
Browse files

ResourceManager: Disable APK Assets cache. 

The WeakReference based cache of Assets in use elsewhere in the
process remains unchanged.

Note that this change is larger than it needs to be because it is
an error to create an LruCache of size zero.

There seems to be no measurable difference as measured by the standard
app startup benchmarks.

Test: atest -v google/perf/app-startup/benchmark-app-hermetic/cold-dropcache-test
Bug: 111385832
(cherry picked from commit bc956218)

Change-Id: Ib7a52bd03f6f13cdb76b82abc307d17227c4c1dc
parent 30fdcbad

core/java/android/app/ResourcesManager.java

+35 −18
Original line number Diff line number Diff line
@@ -121,10 +121,13 @@ public class ResourcesManager { 
        }

    }



    private static final boolean ENABLE_APK_ASSETS_CACHE = true;



    /**

     * The ApkAssets we are caching and intend to hold strong references to.

     */

    private final LruCache<ApkKey, ApkAssets> mLoadedApkAssets = new LruCache<>(3);

    private final LruCache<ApkKey, ApkAssets> mLoadedApkAssets =

            (ENABLE_APK_ASSETS_CACHE) ? new LruCache<>(3) : null;



    /**

     * The ApkAssets that are being referenced in the wild that we can reuse, even if they aren't
@@ -310,17 +313,23 @@ public class ResourcesManager { 
    private @NonNull ApkAssets loadApkAssets(String path, boolean sharedLib, boolean overlay)

            throws IOException {

        final ApkKey newKey = new ApkKey(path, sharedLib, overlay);

        ApkAssets apkAssets = mLoadedApkAssets.get(newKey);

        ApkAssets apkAssets = null;

        if (mLoadedApkAssets != null) {

            apkAssets = mLoadedApkAssets.get(newKey);

            if (apkAssets != null) {

                return apkAssets;

            }

        }



        // Optimistically check if this ApkAssets exists somewhere else.

        final WeakReference<ApkAssets> apkAssetsRef = mCachedApkAssets.get(newKey);

        if (apkAssetsRef != null) {

            apkAssets = apkAssetsRef.get();

            if (apkAssets != null) {

                if (mLoadedApkAssets != null) {

                    mLoadedApkAssets.put(newKey, apkAssets);

                }



                return apkAssets;

            } else {

                // Clean up the reference.
@@ -335,7 +344,11 @@ public class ResourcesManager { 
        } else {

            apkAssets = ApkAssets.loadFromPath(path, false /*system*/, sharedLib);

        }



        if (mLoadedApkAssets != null) {

            mLoadedApkAssets.put(newKey, apkAssets);

        }



        mCachedApkAssets.put(newKey, new WeakReference<>(apkAssets));

        return apkAssets;

    }
@@ -434,6 +447,7 @@ public class ResourcesManager { 


            pw.println("ResourcesManager:");

            pw.increaseIndent();

            if (mLoadedApkAssets != null) {

                pw.print("cached apks: total=");

                pw.print(mLoadedApkAssets.size());

                pw.print(" created=");
@@ -446,6 +460,9 @@ public class ResourcesManager { 
                pw.print(mLoadedApkAssets.missCount());

                pw.print(" max=");

                pw.print(mLoadedApkAssets.maxSize());

            } else {

                pw.print("cached apks: 0 [cache disabled]");

            }

            pw.println();



            pw.print("total apks: ");