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

Commit fbe87233 authored by Winson Chiu's avatar Winson Chiu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "code-paths-and-resources-caching-fix" 

* changes:
  Revert ContextImpl LoadedApk packageInfo caching workaround
  Fix AssetManager2 isUpToDate check
  Diff resource dirs when checking LoadedApk packageInfo cache in ActivityThread
  Diff overlays between PackageManagerService and OverlayManagerService
  Propagate base code path and split dir changes to Resources objects
parents de11a5ae 710e3ecb

core/java/android/app/ActivityThread.java

+68 −36
Original line number Diff line number Diff line
@@ -2100,6 +2100,16 @@ public final class ActivityThread extends ClientTransactionHandler { 
    public final LoadedApk getPackageInfo(String packageName, CompatibilityInfo compatInfo,

            int flags, int userId) {

        final boolean differentUser = (UserHandle.myUserId() != userId);

        ApplicationInfo ai;

        try {

            ai = getPackageManager().getApplicationInfo(packageName,

                    PackageManager.GET_SHARED_LIBRARY_FILES

                            | PackageManager.MATCH_DEBUG_TRIAGED_MISSING,

                    (userId < 0) ? UserHandle.myUserId() : userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }



        synchronized (mResourcesManager) {

            WeakReference<LoadedApk> ref;

            if (differentUser) {
@@ -2112,11 +2122,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
            }



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

            //Slog.i(TAG, "getPackageInfo " + packageName + ": " + packageInfo);

            //if (packageInfo != null) Slog.i(TAG, "isUptoDate " + packageInfo.mResDir

            //        + ": " + packageInfo.mResources.getAssets().isUpToDate());

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

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

            if (ai != null && packageInfo != null && isLoadedApkUpToDate(packageInfo, ai)) {

                if (packageInfo.isSecurityViolation()

                        && (flags&Context.CONTEXT_IGNORE_SECURITY) == 0) {

                    throw new SecurityException(
@@ -2129,16 +2135,6 @@ public final class ActivityThread extends ClientTransactionHandler { 
            }

        }



        ApplicationInfo ai = null;

        try {

            ai = getPackageManager().getApplicationInfo(packageName,

                    PackageManager.GET_SHARED_LIBRARY_FILES

                            | PackageManager.MATCH_DEBUG_TRIAGED_MISSING,

                    (userId < 0) ? UserHandle.myUserId() : userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }



        if (ai != null) {

            return getPackageInfo(ai, compatInfo, flags);

        }
@@ -2209,17 +2205,25 @@ public final class ActivityThread extends ClientTransactionHandler { 
            }



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

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

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

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



            boolean isUpToDate = packageInfo != null && isLoadedApkUpToDate(packageInfo, aInfo);



            if (isUpToDate) {

                return packageInfo;

            }



            if (localLOGV) {

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

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

                        + " (in " + (mBoundApplication != null

                        ? mBoundApplication.processName : null)

                        + ")");

            }



            packageInfo =

                    new LoadedApk(this, aInfo, compatInfo, baseLoader,

                            securityViolation, includeCode &&

                            (aInfo.flags&ApplicationInfo.FLAG_HAS_CODE) != 0, registerPackage);

                            securityViolation, includeCode

                            && (aInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0, registerPackage);



            if (mSystemThread && "android".equals(aInfo.packageName)) {

                packageInfo.installSystemApplicationInfo(aInfo,
@@ -2235,11 +2239,25 @@ public final class ActivityThread extends ClientTransactionHandler { 
                mResourcePackages.put(aInfo.packageName,

                        new WeakReference<LoadedApk>(packageInfo));

            }

            }



            return packageInfo;

        }

    }



    /**

     * Compares overlay/resource directories for a LoadedApk to determine if it's up to date

     * with the given ApplicationInfo.

     */

    private boolean isLoadedApkUpToDate(LoadedApk loadedApk, ApplicationInfo appInfo) {

        Resources packageResources = loadedApk.mResources;

        String[] overlayDirs = ArrayUtils.defeatNullable(loadedApk.getOverlayDirs());

        String[] resourceDirs = ArrayUtils.defeatNullable(appInfo.resourceDirs);



        return (packageResources == null || packageResources.getAssets().isUpToDate())

                && overlayDirs.length == resourceDirs.length

                && ArrayUtils.containsAll(overlayDirs, resourceDirs);

    }



    @UnsupportedAppUsage

    ActivityThread() {

        mResourcesManager = ResourcesManager.getInstance();
@@ -5434,19 +5452,25 @@ public final class ActivityThread extends ClientTransactionHandler { 
            ref = mResourcePackages.get(ai.packageName);

            resApk = ref != null ? ref.get() : null;

        }



        final String[] oldResDirs = new String[2];



        if (apk != null) {

            oldResDirs[0] = apk.getResDir();

            final ArrayList<String> oldPaths = new ArrayList<>();

            LoadedApk.makePaths(this, apk.getApplicationInfo(), oldPaths);

            apk.updateApplicationInfo(ai, oldPaths);

        }

        if (resApk != null) {

            oldResDirs[1] = resApk.getResDir();

            final ArrayList<String> oldPaths = new ArrayList<>();

            LoadedApk.makePaths(this, resApk.getApplicationInfo(), oldPaths);

            resApk.updateApplicationInfo(ai, oldPaths);

        }



        synchronized (mResourcesManager) {

            // Update all affected Resources objects to use new ResourcesImpl

            mResourcesManager.applyNewResourceDirsLocked(ai.sourceDir, ai.resourceDirs);

            mResourcesManager.applyNewResourceDirsLocked(ai, oldResDirs);

        }



        ApplicationPackageManager.configurationChanged();
@@ -5699,9 +5723,17 @@ public final class ActivityThread extends ClientTransactionHandler { 
                                        }

                                    }

                                }



                                final String[] oldResDirs = { pkgInfo.getResDir() };



                                final ArrayList<String> oldPaths = new ArrayList<>();

                                LoadedApk.makePaths(this, pkgInfo.getApplicationInfo(), oldPaths);

                                pkgInfo.updateApplicationInfo(aInfo, oldPaths);



                                synchronized (mResourcesManager) {

                                    // Update affected Resources objects to use new ResourcesImpl

                                    mResourcesManager.applyNewResourceDirsLocked(aInfo, oldResDirs);

                                }

                            } catch (RemoteException e) {

                            }

                        }

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;

    }

core/java/android/app/ResourcesManager.java

+28 −7
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;

import android.content.res.ApkAssets;

import android.content.res.AssetManager;

import android.content.res.CompatResources;
@@ -32,6 +33,7 @@ import android.content.res.ResourcesImpl; 
import android.content.res.ResourcesKey;

import android.hardware.display.DisplayManagerGlobal;

import android.os.IBinder;

import android.os.Process;

import android.os.Trace;

import android.util.ArrayMap;

import android.util.DisplayMetrics;
@@ -1136,27 +1138,46 @@ public class ResourcesManager { 
    }



    // TODO(adamlesinski): Make this accept more than just overlay directories.

    final void applyNewResourceDirsLocked(@NonNull final String baseCodePath,

            @Nullable final String[] newResourceDirs) {

    final void applyNewResourceDirsLocked(@NonNull final ApplicationInfo appInfo,

            @Nullable final String[] oldPaths) {

        try {

            Trace.traceBegin(Trace.TRACE_TAG_RESOURCES,

                    "ResourcesManager#applyNewResourceDirsLocked");



            String baseCodePath = appInfo.getBaseCodePath();



            final int myUid = Process.myUid();

            String[] newSplitDirs = appInfo.uid == myUid

                    ? appInfo.splitSourceDirs

                    : appInfo.splitPublicSourceDirs;



            // ApplicationInfo is mutable, so clone the arrays to prevent outside modification

            String[] copiedSplitDirs = ArrayUtils.cloneOrNull(newSplitDirs);

            String[] copiedResourceDirs = ArrayUtils.cloneOrNull(appInfo.resourceDirs);



            final ArrayMap<ResourcesImpl, ResourcesKey> updatedResourceKeys = new ArrayMap<>();

            final int implCount = mResourceImpls.size();

            for (int i = 0; i < implCount; i++) {

                final ResourcesKey key = mResourceImpls.keyAt(i);

                final WeakReference<ResourcesImpl> weakImplRef = mResourceImpls.valueAt(i);

                final ResourcesImpl impl = weakImplRef != null ? weakImplRef.get() : null;

                if (impl != null && (key.mResDir == null || key.mResDir.equals(baseCodePath))) {



                if (impl == null) {

                    continue;

                }



                if (key.mResDir == null

                        || key.mResDir.equals(baseCodePath)

                        || ArrayUtils.contains(oldPaths, key.mResDir)) {

                    updatedResourceKeys.put(impl, new ResourcesKey(

                            key.mResDir,

                            key.mSplitResDirs,

                            newResourceDirs,

                            baseCodePath,

                            copiedSplitDirs,

                            copiedResourceDirs,

                            key.mLibDirs,

                            key.mDisplayId,

                            key.mOverrideConfiguration,

                            key.mCompatInfo));

                            key.mCompatInfo

                    ));

                }

            }

core/java/android/content/om/OverlayInfo.java

+8 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public final class OverlayInfo implements Parcelable { 
            STATE_DISABLED,

            STATE_ENABLED,

            STATE_ENABLED_STATIC,

            STATE_TARGET_UPGRADING,

            // @Deprecated STATE_TARGET_UPGRADING,

            STATE_OVERLAY_UPGRADING,

    })

    /** @hide */
@@ -96,7 +96,14 @@ public final class OverlayInfo implements Parcelable { 
     * The target package is currently being upgraded; the state will change

     * once the package installation has finished.

     * @hide

     *

     * @deprecated No longer used. Caused invalid transitions from enabled -> upgrading -> enabled,

     * where an update is propagated when nothing has changed. Can occur during --dont-kill

     * installs when code and resources are hot swapped and the Activity should not be relaunched.

     * In all other cases, the process and therefore Activity is killed, so the state loop is

     * irrelevant.

     */

    @Deprecated

    public static final int STATE_TARGET_UPGRADING = 4;



    /**

core/java/android/content/res/AssetManager.java

+10 −3
Original line number Diff line number Diff line
@@ -1263,13 +1263,20 @@ public final class AssetManager implements AutoCloseable { 
     */

    @UnsupportedAppUsage

    public boolean isUpToDate() {

        for (ApkAssets apkAssets : getApkAssets()) {

        synchronized (this) {

            if (!mOpen) {

                return false;

            }



            for (ApkAssets apkAssets : mApkAssets) {

                if (!apkAssets.isUpToDate()) {

                    return false;

                }

            }



            return true;

        }

    }



    /**

     * Get the locales that this asset manager contains data for.