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

Commit ab234099 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Flags to select storage volume for app installs. 

Remote callers can now provide the "--install-location" value from
the APK to help select a location, or they can explicitly force a
volume by UUID.

Bug: 21676789
Change-Id: Iefc92d770a851fc33e37edbf259fdb8df2b14ae5
parent 4e83cc9f

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

+10 −0
Original line number Diff line number Diff line
@@ -1037,6 +1037,14 @@ public final class Pm { 
                params.abiOverride = checkAbiArgument(nextOptionData());

            } else if (opt.equals("--user")) {

                userId = Integer.parseInt(nextOptionData());

            } else if (opt.equals("--install-location")) {

                params.installLocation = Integer.parseInt(nextOptionData());

            } else if (opt.equals("--force-uuid")) {

                params.installFlags |= PackageManager.INSTALL_FORCE_VOLUME_UUID;

                params.volumeUuid = nextOptionData();

                if ("internal".equals(params.volumeUuid)) {

                    params.volumeUuid = null;

                }

            } else {

                throw new IllegalArgumentException("Unknown option " + opt);

            }
@@ -1885,6 +1893,8 @@ public final class Pm { 
        System.err.println("       pm dump PACKAGE");

        System.err.println("       pm install [-lrtsfd] [-i PACKAGE] [--user USER_ID] [PATH]");

        System.err.println("       pm install-create [-lrtsfdp] [-i PACKAGE] [-S BYTES]");

        System.err.println("               [--install-location 0/1/2]");

        System.err.println("               [--force-uuid internal|UUID]");

        System.err.println("       pm install-write [-S BYTES] SESSION_ID SPLIT_NAME [PATH]");

        System.err.println("       pm install-commit SESSION_ID");

        System.err.println("       pm install-abandon SESSION_ID");

core/java/android/content/pm/PackageManager.java

+3 −0
Original line number Diff line number Diff line
@@ -401,6 +401,9 @@ public abstract class PackageManager { 
     */

    public static final int INSTALL_GRANT_RUNTIME_PERMISSIONS = 0x00000100;



    /** {@hide} */

    public static final int INSTALL_FORCE_VOLUME_UUID = 0x00000200;



    /**

     * Flag parameter for

     * {@link #setComponentEnabledSetting(android.content.ComponentName, int, int)} to indicate

services/core/java/com/android/server/pm/PackageInstallerService.java

+5 −0
Original line number Diff line number Diff line
@@ -571,6 +571,11 @@ public class PackageInstallerService extends IPackageInstaller.Stub { 
                throw new IOException("No suitable external storage available");

            }



        } else if ((params.installFlags & PackageManager.INSTALL_FORCE_VOLUME_UUID) != 0) {

            // For now, installs to adopted media are treated as internal from

            // an install flag point-of-view.

            params.setInstallFlagsInternal();



        } else {

            // For now, installs to adopted media are treated as internal from

            // an install flag point-of-view.