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

Commit e950ce12 authored by rovo89's avatar rovo89 Committed by Ricardo Cerqueira
Browse files

Restore lazy loading of LoadedApk resources 

This was broken in 8fff544e. Since that change,
resources are always initialized in getPackageInfo(), even if they haven't been
loaded before (mResources == null).

It shouldn't be necessary in *any* case to preload the resources at this point.
Anything using the resources should call LoadedApk.getResources(), which will
initialize them just when needed. Setting mResources to null resets the cache
and will force a reload the next time the resources are requested.

Change-Id: I9bc9986297478e99752b1e2b9bd04dab3dcc9656
parent c95db91a

core/java/android/app/ActivityThread.java

+2 −3
Original line number Diff line number Diff line
@@ -1674,10 +1674,9 @@ public final class ActivityThread { 
                            new WeakReference<LoadedApk>(packageInfo));

                }

            }

            if (packageInfo.mResources == null

                    || !packageInfo.mResources.getAssets().isUpToDate()) {

            if (packageInfo.mResources != null

                    && !packageInfo.mResources.getAssets().isUpToDate()) {

                packageInfo.mResources = null;

                packageInfo.getResources(this);

            }

            return packageInfo;

        }