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

Commit 4b60d293 authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi
Browse files

Move IO from under the ResourcesManager lock 

ApkAssets.isUpToDate() performs IO for many types of assets,
and doing it under a highly contended lock may cause visible
jank.

Given that we don't have to remove the key right at the time of
the lookup, it's fine to move the up-to-date check out of the
lock - if it's not, the function would replace the outdated
asset anyway

Bug: 259941466
Test: build + boot
Change-Id: I8828deadc82180e93bbd9fc34f80a7bd9411d4ad
parent 3d0a6c17

core/java/android/app/ResourcesManager.java

+14 −12
Original line number Diff line number Diff line
@@ -305,9 +305,13 @@ public class ResourcesManager { 
            for (int i = mCachedApkAssets.size() - 1; i >= 0; i--) {

                final ApkKey key = mCachedApkAssets.keyAt(i);

                if (key.path.equals(path)) {

                    WeakReference<ApkAssets> apkAssetsRef = mCachedApkAssets.removeAt(i);

                    if (apkAssetsRef != null && apkAssetsRef.get() != null) {

                        apkAssetsRef.get().close();

                    final WeakReference<ApkAssets> apkAssetsRef = mCachedApkAssets.removeAt(i);

                    if (apkAssetsRef == null) {

                        continue;

                    }

                    final ApkAssets apkAssets = apkAssetsRef.get();

                    if (apkAssets != null) {

                        apkAssets.close();

                    }

                }

            }
@@ -446,16 +450,14 @@ public class ResourcesManager { 
        ApkAssets apkAssets;



        // Optimistically check if this ApkAssets exists somewhere else.

        final WeakReference<ApkAssets> apkAssetsRef;

        synchronized (mLock) {

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

            apkAssetsRef = mCachedApkAssets.get(key);

        }

        if (apkAssetsRef != null) {

            apkAssets = apkAssetsRef.get();

            if (apkAssets != null && apkAssets.isUpToDate()) {

                return apkAssets;

                } else {

                    // Clean up the reference.

                    mCachedApkAssets.remove(key);

                }

            }

        }