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

Commit 9aa513bf authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "Add support for Split APK dependcies"

parents 5403efba 4e862815

api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -739,6 +739,7 @@ package android { 
    field public static final int isScrollContainer = 16843342; // 0x101024e

    field public static final int isSticky = 16843335; // 0x1010247

    field public static final int isolatedProcess = 16843689; // 0x10103a9

    field public static final int isolatedSplits = 16844109; // 0x101054d

    field public static final int itemBackground = 16843056; // 0x1010130

    field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131

    field public static final int itemPadding = 16843565; // 0x101032d
@@ -8365,6 +8366,7 @@ package android.content { 
    method public abstract int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);

    method public abstract deprecated void clearWallpaper() throws java.io.IOException;

    method public abstract android.content.Context createConfigurationContext(android.content.res.Configuration);

    method public abstract android.content.Context createContextForSplit(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract android.content.Context createDeviceProtectedStorageContext();

    method public abstract android.content.Context createDisplayContext(android.view.Display);

    method public abstract android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -8563,6 +8565,7 @@ package android.content { 
    method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);

    method public deprecated void clearWallpaper() throws java.io.IOException;

    method public android.content.Context createConfigurationContext(android.content.res.Configuration);

    method public android.content.Context createContextForSplit(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public android.content.Context createDeviceProtectedStorageContext();

    method public android.content.Context createDisplayContext(android.view.Display);

    method public android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -9747,6 +9750,7 @@ 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[] splitNames;

    field public java.lang.String[] splitPublicSourceDirs;

    field public java.lang.String[] splitSourceDirs;

    field public int targetSdkVersion;
@@ -9829,6 +9833,7 @@ 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[] splitNames;

    field public java.lang.String[] splitPublicSourceDirs;

    field public java.lang.String[] splitSourceDirs;

    field public java.lang.String targetPackage;
@@ -29977,6 +29982,7 @@ package android.os { 
    method public final android.util.SizeF readSizeF();

    method public final android.util.SparseArray readSparseArray(java.lang.ClassLoader);

    method public final android.util.SparseBooleanArray readSparseBooleanArray();

    method public final android.util.SparseIntArray readSparseIntArray();

    method public final java.lang.String readString();

    method public final void readStringArray(java.lang.String[]);

    method public final void readStringList(java.util.List<java.lang.String>);
@@ -30021,6 +30027,7 @@ package android.os { 
    method public final void writeSizeF(android.util.SizeF);

    method public final void writeSparseArray(android.util.SparseArray<java.lang.Object>);

    method public final void writeSparseBooleanArray(android.util.SparseBooleanArray);

    method public final void writeSparseIntArray(android.util.SparseIntArray);

    method public final void writeString(java.lang.String);

    method public final void writeStringArray(java.lang.String[]);

    method public final void writeStringList(java.util.List<java.lang.String>);
@@ -39262,6 +39269,7 @@ package android.test.mock { 
    method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);

    method public void clearWallpaper();

    method public android.content.Context createConfigurationContext(android.content.res.Configuration);

    method public android.content.Context createContextForSplit(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public android.content.Context createDeviceProtectedStorageContext();

    method public android.content.Context createDisplayContext(android.view.Display);

    method public android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

api/system-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -850,6 +850,7 @@ package android { 
    field public static final int isScrollContainer = 16843342; // 0x101024e

    field public static final int isSticky = 16843335; // 0x1010247

    field public static final int isolatedProcess = 16843689; // 0x10103a9

    field public static final int isolatedSplits = 16844109; // 0x101054d

    field public static final int itemBackground = 16843056; // 0x1010130

    field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131

    field public static final int itemPadding = 16843565; // 0x101032d
@@ -8747,6 +8748,7 @@ package android.content { 
    method public abstract int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);

    method public abstract deprecated void clearWallpaper() throws java.io.IOException;

    method public abstract android.content.Context createConfigurationContext(android.content.res.Configuration);

    method public abstract android.content.Context createContextForSplit(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract android.content.Context createCredentialProtectedStorageContext();

    method public abstract android.content.Context createDeviceProtectedStorageContext();

    method public abstract android.content.Context createDisplayContext(android.view.Display);
@@ -8957,6 +8959,7 @@ package android.content { 
    method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);

    method public deprecated void clearWallpaper() throws java.io.IOException;

    method public android.content.Context createConfigurationContext(android.content.res.Configuration);

    method public android.content.Context createContextForSplit(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public android.content.Context createCredentialProtectedStorageContext();

    method public android.content.Context createDeviceProtectedStorageContext();

    method public android.content.Context createDisplayContext(android.view.Display);
@@ -10162,6 +10165,7 @@ 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[] splitNames;

    field public java.lang.String[] splitPublicSourceDirs;

    field public java.lang.String[] splitSourceDirs;

    field public int targetSdkVersion;
@@ -10279,6 +10283,7 @@ 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[] splitNames;

    field public java.lang.String[] splitPublicSourceDirs;

    field public java.lang.String[] splitSourceDirs;

    field public java.lang.String targetPackage;
@@ -32693,6 +32698,7 @@ package android.os { 
    method public final android.util.SizeF readSizeF();

    method public final android.util.SparseArray readSparseArray(java.lang.ClassLoader);

    method public final android.util.SparseBooleanArray readSparseBooleanArray();

    method public final android.util.SparseIntArray readSparseIntArray();

    method public final java.lang.String readString();

    method public final void readStringArray(java.lang.String[]);

    method public final void readStringList(java.util.List<java.lang.String>);
@@ -32737,6 +32743,7 @@ package android.os { 
    method public final void writeSizeF(android.util.SizeF);

    method public final void writeSparseArray(android.util.SparseArray<java.lang.Object>);

    method public final void writeSparseBooleanArray(android.util.SparseBooleanArray);

    method public final void writeSparseIntArray(android.util.SparseIntArray);

    method public final void writeString(java.lang.String);

    method public final void writeStringArray(java.lang.String[]);

    method public final void writeStringList(java.util.List<java.lang.String>);
@@ -42625,6 +42632,7 @@ package android.test.mock { 
    method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);

    method public void clearWallpaper();

    method public android.content.Context createConfigurationContext(android.content.res.Configuration);

    method public android.content.Context createContextForSplit(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public android.content.Context createCredentialProtectedStorageContext();

    method public android.content.Context createDeviceProtectedStorageContext();

    method public android.content.Context createDisplayContext(android.view.Display);

api/test-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -739,6 +739,7 @@ package android { 
    field public static final int isScrollContainer = 16843342; // 0x101024e

    field public static final int isSticky = 16843335; // 0x1010247

    field public static final int isolatedProcess = 16843689; // 0x10103a9

    field public static final int isolatedSplits = 16844109; // 0x101054d

    field public static final int itemBackground = 16843056; // 0x1010130

    field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131

    field public static final int itemPadding = 16843565; // 0x101032d
@@ -8388,6 +8389,7 @@ package android.content { 
    method public abstract int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);

    method public abstract deprecated void clearWallpaper() throws java.io.IOException;

    method public abstract android.content.Context createConfigurationContext(android.content.res.Configuration);

    method public abstract android.content.Context createContextForSplit(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract android.content.Context createDeviceProtectedStorageContext();

    method public abstract android.content.Context createDisplayContext(android.view.Display);

    method public abstract android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -8587,6 +8589,7 @@ package android.content { 
    method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);

    method public deprecated void clearWallpaper() throws java.io.IOException;

    method public android.content.Context createConfigurationContext(android.content.res.Configuration);

    method public android.content.Context createContextForSplit(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public android.content.Context createDeviceProtectedStorageContext();

    method public android.content.Context createDisplayContext(android.view.Display);

    method public android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -9774,6 +9777,7 @@ 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[] splitNames;

    field public java.lang.String[] splitPublicSourceDirs;

    field public java.lang.String[] splitSourceDirs;

    field public int targetSdkVersion;
@@ -9856,6 +9860,7 @@ 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[] splitNames;

    field public java.lang.String[] splitPublicSourceDirs;

    field public java.lang.String[] splitSourceDirs;

    field public java.lang.String targetPackage;
@@ -30088,6 +30093,7 @@ package android.os { 
    method public final android.util.SizeF readSizeF();

    method public final android.util.SparseArray readSparseArray(java.lang.ClassLoader);

    method public final android.util.SparseBooleanArray readSparseBooleanArray();

    method public final android.util.SparseIntArray readSparseIntArray();

    method public final java.lang.String readString();

    method public final void readStringArray(java.lang.String[]);

    method public final void readStringList(java.util.List<java.lang.String>);
@@ -30132,6 +30138,7 @@ package android.os { 
    method public final void writeSizeF(android.util.SizeF);

    method public final void writeSparseArray(android.util.SparseArray<java.lang.Object>);

    method public final void writeSparseBooleanArray(android.util.SparseBooleanArray);

    method public final void writeSparseIntArray(android.util.SparseIntArray);

    method public final void writeString(java.lang.String);

    method public final void writeStringArray(java.lang.String[]);

    method public final void writeStringList(java.util.List<java.lang.String>);
@@ -39395,6 +39402,7 @@ package android.test.mock { 
    method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);

    method public void clearWallpaper();

    method public android.content.Context createConfigurationContext(android.content.res.Configuration);

    method public android.content.Context createContextForSplit(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public android.content.Context createDeviceProtectedStorageContext();

    method public android.content.Context createDisplayContext(android.view.Display);

    method public android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

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

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ public final class Pm { 
            if (file.isFile()) {

                try {

                    ApkLite baseApk = PackageParser.parseApkLite(file, 0);

                    PackageLite pkgLite = new PackageLite(null, baseApk, null, null, null);

                    PackageLite pkgLite = new PackageLite(null, baseApk, null, null, null, null);

                    params.sessionParams.setSize(

                            PackageHelper.calculateInstalledSize(pkgLite, false,

                            params.sessionParams.abiOverride));

core/java/android/app/ActivityThread.java

+25 −13
Original line number Diff line number Diff line
@@ -2616,9 +2616,10 @@ public final class ActivityThread { 
                    r.activityInfo.targetActivity);

        }



        ContextImpl appContext = createBaseContextForActivity(r);

        Activity activity = null;

        try {

            java.lang.ClassLoader cl = r.packageInfo.getClassLoader();

            java.lang.ClassLoader cl = appContext.getClassLoader();

            activity = mInstrumentation.newActivity(

                    cl, component.getClassName(), r.intent);

            StrictMode.incrementExpectedActivityCount(activity.getClass());
@@ -2647,7 +2648,6 @@ public final class ActivityThread { 
                    + ", dir=" + r.packageInfo.getAppDir());



            if (activity != null) {

                Context appContext = createBaseContextForActivity(r, activity);

                CharSequence title = r.activityInfo.loadLabel(appContext.getPackageManager());

                Configuration config = new Configuration(mCompatConfiguration);

                if (r.overrideConfig != null) {
@@ -2661,6 +2661,7 @@ public final class ActivityThread { 
                    r.mPendingRemoveWindow = null;

                    r.mPendingRemoveWindowManager = null;

                }

                appContext.setOuterContext(activity);

                activity.attach(appContext, this, getInstrumentation(), r.token,

                        r.ident, app, r.intent, r.activityInfo, title, r.parent,

                        r.embeddedID, r.lastNonConfigurationInstances, config,
@@ -2736,8 +2737,8 @@ public final class ActivityThread { 
        return activity;

    }



    private Context createBaseContextForActivity(ActivityClientRecord r, final Activity activity) {

        int displayId = Display.DEFAULT_DISPLAY;

    private ContextImpl createBaseContextForActivity(ActivityClientRecord r) {

        final int displayId;

        try {

            displayId = ActivityManager.getService().getActivityDisplayId(r.token);

        } catch (RemoteException e) {
@@ -2745,9 +2746,7 @@ public final class ActivityThread { 
        }



        ContextImpl appContext = ContextImpl.createActivityContext(

                this, r.packageInfo, r.token, displayId, r.overrideConfig);

        appContext.setOuterContext(activity);

        Context baseContext = appContext;

                this, r.packageInfo, r.activityInfo, r.token, displayId, r.overrideConfig);



        final DisplayManagerGlobal dm = DisplayManagerGlobal.getInstance();

        // For debugging purposes, if the activity's package name contains the value of
@@ -2760,12 +2759,12 @@ public final class ActivityThread { 
                if (id != Display.DEFAULT_DISPLAY) {

                    Display display =

                            dm.getCompatibleDisplay(id, appContext.getDisplayAdjustments(id));

                    baseContext = appContext.createDisplayContext(display);

                    appContext = (ContextImpl) appContext.createDisplayContext(display);

                    break;

                }

            }

        }

        return baseContext;

        return appContext;

    }



    private void handleLaunchActivity(ActivityClientRecord r, Intent customIntent, String reason) {
@@ -3119,9 +3118,16 @@ public final class ActivityThread { 


        IActivityManager mgr = ActivityManager.getService();



        Application app;

        BroadcastReceiver receiver;

        ContextImpl context;

        try {

            java.lang.ClassLoader cl = packageInfo.getClassLoader();

            app = packageInfo.makeApplication(false, mInstrumentation);

            context = (ContextImpl) app.getBaseContext();

            if (data.info.splitName != null) {

                context = (ContextImpl) context.createContextForSplit(data.info.splitName);

            }

            java.lang.ClassLoader cl = context.getClassLoader();

            data.intent.setExtrasClassLoader(cl);

            data.intent.prepareToEnterProcess();

            data.setExtrasClassLoader(cl);
@@ -3136,8 +3142,6 @@ public final class ActivityThread { 
        }



        try {

            Application app = packageInfo.makeApplication(false, mInstrumentation);



            if (localLOGV) Slog.v(

                TAG, "Performing receive of " + data.intent

                + ": app=" + app
@@ -3146,7 +3150,6 @@ public final class ActivityThread { 
                + ", comp=" + data.intent.getComponent().toShortString()

                + ", dir=" + packageInfo.getAppDir());



            ContextImpl context = (ContextImpl)app.getBaseContext();

            sCurrentBroadcastIntent.set(data.intent);

            receiver.setPendingResult(data);

            receiver.onReceive(context.getReceiverRestrictedContext(),
@@ -6031,6 +6034,15 @@ public final class ActivityThread { 
                      info.name);

                return null;

            }



            if (info.splitName != null) {

                try {

                    c = c.createContextForSplit(info.splitName);

                } catch (NameNotFoundException e) {

                    throw new RuntimeException(e);

                }

            }



            try {

                final java.lang.ClassLoader cl = c.getClassLoader();

                localProvider = (ContentProvider)cl.