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

Commit 8a4c9721 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Plumb split APKs into public API. 

Introduces new ApplicationInfo fields to surface zero or more split
APKs for an application.  Splice these APKs into both the class
loader and resource system.  Cleaner building of these paths.

Run dexopt() on all split APKs found after a parse, and populate
into ApplicationInfo.

Change-Id: I4a376bf4492d84ea95aafa866e106ea43a43e492
parent 56405414

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -8148,6 +8148,8 @@ package android.content.pm { 
    field public int requiresSmallestWidthDp;

    field public java.lang.String[] sharedLibraryFiles;

    field public java.lang.String sourceDir;

    field public java.lang.String[] splitPublicSourceDirs;

    field public java.lang.String[] splitSourceDirs;

    field public int targetSdkVersion;

    field public java.lang.String taskAffinity;

    field public int theme;
@@ -8216,6 +8218,8 @@ package android.content.pm { 
    field public boolean handleProfiling;

    field public java.lang.String publicSourceDir;

    field public java.lang.String sourceDir;

    field public java.lang.String[] splitPublicSourceDirs;

    field public java.lang.String[] splitSourceDirs;

    field public java.lang.String targetPackage;

  }

























cmds/pm/src/com/android/commands/pm/Pm.java



+8
−0




























Original line number
Diff line number
Diff line








@@ -58,11 +58,13 @@ import java.util.Collections;













import java.util.Comparator;















import java.util.List;















import java.util.WeakHashMap;





























import javax.crypto.SecretKey;















import javax.crypto.spec.IvParameterSpec;















import javax.crypto.spec.SecretKeySpec;































import com.android.internal.content.PackageHelper;













import com.android.internal.util.ArrayUtils;































public final class Pm {















    IPackageManager mPm;










@@ -1548,6 +1550,12 @@ public final class Pm {













            if (info != null && info.applicationInfo != null) {















                System.out.print("package:");















                System.out.println(info.applicationInfo.sourceDir);













                if (!ArrayUtils.isEmpty(info.applicationInfo.splitSourceDirs)) {













                    for (String splitSourceDir : info.applicationInfo.splitSourceDirs) {













                        System.out.print("package:");













                        System.out.println(splitSourceDir);













                    }













                }















            }















        } catch (RemoteException e) {















            System.err.println(e.toString());

































core/java/android/app/ActivityThread.java



+16
−10




























Original line number
Diff line number
Diff line








@@ -191,11 +191,13 @@ public final class ActivityThread {













    /** Reference to singleton {@link ActivityThread} */















    private static ActivityThread sCurrentActivityThread;















    Instrumentation mInstrumentation;













    String mInstrumentationPackageName = null;















    String mInstrumentationAppDir = null;













    String mInstrumentationAppLibraryDir = null;













    String mInstrumentationAppPackage = null;













    String[] mInstrumentationSplitAppDirs = null;













    String mInstrumentationLibDir = null;















    String mInstrumentedAppDir = null;













    String mInstrumentedAppLibraryDir = null;













    String[] mInstrumentedSplitAppDirs = null;













    String mInstrumentedLibDir = null;















    boolean mSystemThread = false;















    boolean mJitEnabled = false;


























@@ -1585,11 +1587,11 @@ public final class ActivityThread {













    /**















     * Creates the top level resources for the given package.















     */













    Resources getTopLevelResources(String resDir, String[] overlayDirs, String[] libDirs,













            int displayId, Configuration overrideConfiguration,













    Resources getTopLevelResources(String resDir, String[] splitResDirs, String[] overlayDirs,













            String[] libDirs, int displayId, Configuration overrideConfiguration,















            LoadedApk pkgInfo) {













        return mResourcesManager.getTopLevelResources(resDir, overlayDirs, libDirs, displayId,













                overrideConfiguration, pkgInfo.getCompatibilityInfo(), null);













        return mResourcesManager.getTopLevelResources(resDir, splitResDirs, overlayDirs, libDirs,













                displayId, overrideConfiguration, pkgInfo.getCompatibilityInfo(), null);















    }































    final Handler getHandler() {










@@ -4315,16 +4317,20 @@ public final class ActivityThread {













                    + data.instrumentationName);















            }





























            mInstrumentationPackageName = ii.packageName;















            mInstrumentationAppDir = ii.sourceDir;













            mInstrumentationAppLibraryDir = ii.nativeLibraryDir;













            mInstrumentationAppPackage = ii.packageName;













            mInstrumentationSplitAppDirs = ii.splitSourceDirs;













            mInstrumentationLibDir = ii.nativeLibraryDir;















            mInstrumentedAppDir = data.info.getAppDir();













            mInstrumentedAppLibraryDir = data.info.getLibDir();













            mInstrumentedSplitAppDirs = data.info.getSplitAppDirs();













            mInstrumentedLibDir = data.info.getLibDir();































            ApplicationInfo instrApp = new ApplicationInfo();















            instrApp.packageName = ii.packageName;















            instrApp.sourceDir = ii.sourceDir;















            instrApp.publicSourceDir = ii.publicSourceDir;













            instrApp.splitSourceDirs = ii.splitSourceDirs;













            instrApp.splitPublicSourceDirs = ii.splitPublicSourceDirs;















            instrApp.dataDir = ii.dataDir;















            instrApp.nativeLibraryDir = ii.nativeLibraryDir;















            LoadedApk pi = getPackageInfo(instrApp, data.compatInfo,

































core/java/android/app/ApplicationPackageManager.java



+3
−1




























Original line number
Diff line number
Diff line








@@ -823,8 +823,10 @@ final class ApplicationPackageManager extends PackageManager {













        if (app.packageName.equals("system")) {















            return mContext.mMainThread.getSystemContext().getResources();















        }













        final boolean sameUid = (app.uid == Process.myUid());















        Resources r = mContext.mMainThread.getTopLevelResources(













                app.uid == Process.myUid() ? app.sourceDir : app.publicSourceDir,













                sameUid ? app.sourceDir : app.publicSourceDir,













                sameUid ? app.splitSourceDirs : app.splitPublicSourceDirs,















                app.resourceDirs, null, Display.DEFAULT_DISPLAY, null, mContext.mPackageInfo);















        if (r != null) {















            return r;

































core/java/android/app/ContextImpl.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -2190,10 +2190,10 @@ class ContextImpl extends Context {













                    || overrideConfiguration != null















                    || (compatInfo != null && compatInfo.applicationScale















                            != resources.getCompatibilityInfo().applicationScale)) {













                resources = mResourcesManager.getTopLevelResources(













                        packageInfo.getResDir(), packageInfo.getOverlayDirs(),













                        packageInfo.getApplicationInfo().sharedLibraryFiles,













                        displayId, overrideConfiguration, compatInfo, activityToken);













                resources = mResourcesManager.getTopLevelResources(packageInfo.getResDir(),













                        packageInfo.getSplitResDirs(), packageInfo.getOverlayDirs(),













                        packageInfo.getApplicationInfo().sharedLibraryFiles, displayId,













                        overrideConfiguration, compatInfo, activityToken);















            }















        }















        mResources = resources;