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

Commit 25ea8a3a authored by Clark Scheff's avatar Clark Scheff Committed by Gerrit Code Review
Browse files

Merge "Themes: Update LoadedApk resources." into cm-11.0

parents 4c299e8f 8fff544e

core/java/android/app/ActivityThread.java

+6 −2
Original line number Diff line number Diff line
@@ -1656,8 +1656,7 @@ public final class ActivityThread { 
                ref = mResourcePackages.get(aInfo.packageName);

            }

            LoadedApk packageInfo = ref != null ? ref.get() : null;

            if (packageInfo == null || (packageInfo.mResources != null

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

            if (packageInfo == null) {

                if (localLOGV) Slog.v(TAG, (includeCode ? "Loading code package "

                        : "Loading resource-only package ") + aInfo.packageName

                        + " (in " + (mBoundApplication != null
@@ -1675,6 +1674,11 @@ public final class ActivityThread { 
                            new WeakReference<LoadedApk>(packageInfo));

                }

            }

            if (packageInfo.mResources == null

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

                packageInfo.mResources = null;

                packageInfo.getResources(this);

            }

            return packageInfo;

        }

    }