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

Commit e7beb39f authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

Disable Incremental installation of system apps + test. 

Bug: 160271473
Test: atest PackageManagerShellCommandIncrementalTest
Change-Id: I04ab98418c37e0dfa56bd1e2a5fded6a23e8d9df
parent 50d99e60

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

+5 −4
Original line number Diff line number Diff line
@@ -1494,12 +1494,12 @@ public abstract class PackageManager { 
    public static final int INSTALL_FAILED_ABORTED = -115;



    /**

     * Installation failed return code: instant app installs are incompatible with some

     * other installation flags supplied for the operation; or other circumstances such

     * as trying to upgrade a system app via an instant app install.

     * Installation failed return code: install type is incompatible with some other

     * installation flags supplied for the operation; or other circumstances such as trying

     * to upgrade a system app via an Incremental or instant app install.

     * @hide

     */

    public static final int INSTALL_FAILED_INSTANT_APP_INVALID = -116;

    public static final int INSTALL_FAILED_SESSION_INVALID = -116;



    /**

     * Installation parse return code: this is passed in the
@@ -7474,6 +7474,7 @@ public abstract class PackageManager { 
            case INSTALL_FAILED_BAD_SIGNATURE: return "INSTALL_FAILED_BAD_SIGNATURE";

            case INSTALL_FAILED_WRONG_INSTALLED_VERSION: return "INSTALL_FAILED_WRONG_INSTALLED_VERSION";

            case INSTALL_FAILED_PROCESS_NOT_DEFINED: return "INSTALL_FAILED_PROCESS_NOT_DEFINED";

            case INSTALL_FAILED_SESSION_INVALID: return "INSTALL_FAILED_SESSION_INVALID";

            default: return Integer.toString(status);

        }

    }

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

+8 −8
Original line number Diff line number Diff line
@@ -606,15 +606,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            }

        }



        if (isIncrementalInstallation()) {

            if (!IncrementalManager.isAllowed()) {

        if (isIncrementalInstallation() && !IncrementalManager.isAllowed()) {

            throw new IllegalArgumentException("Incremental installation not allowed.");

        }

            if (!isIncrementalInstallationAllowed(mPackageName)) {

                throw new IllegalArgumentException(

                        "Incremental installation of this package is not allowed.");

            }

        }

    }



    /**
@@ -2154,6 +2148,12 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            }

        }



        if (isIncrementalInstallation() && !isIncrementalInstallationAllowed(mPackageName)) {

            throw new PackageManagerException(

                    PackageManager.INSTALL_FAILED_SESSION_INVALID,

                    "Incremental installation of this package is not allowed.");

        }



        if (params.mode == SessionParams.MODE_FULL_INSTALL) {

            // Full installs must include a base package

            if (!stagedSplits.contains(null)) {

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

+8 −8
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import static android.content.pm.PackageManager.FLAG_PERMISSION_WHITELIST_INSTAL 
import static android.content.pm.PackageManager.INSTALL_FAILED_ALREADY_EXISTS;

import static android.content.pm.PackageManager.INSTALL_FAILED_DUPLICATE_PACKAGE;

import static android.content.pm.PackageManager.INSTALL_FAILED_DUPLICATE_PERMISSION;

import static android.content.pm.PackageManager.INSTALL_FAILED_INSTANT_APP_INVALID;

import static android.content.pm.PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE;

import static android.content.pm.PackageManager.INSTALL_FAILED_INTERNAL_ERROR;

import static android.content.pm.PackageManager.INSTALL_FAILED_INVALID_APK;
@@ -59,6 +58,7 @@ import static android.content.pm.PackageManager.INSTALL_FAILED_INVALID_INSTALL_L 
import static android.content.pm.PackageManager.INSTALL_FAILED_MISSING_SHARED_LIBRARY;

import static android.content.pm.PackageManager.INSTALL_FAILED_PACKAGE_CHANGED;

import static android.content.pm.PackageManager.INSTALL_FAILED_PROCESS_NOT_DEFINED;

import static android.content.pm.PackageManager.INSTALL_FAILED_SESSION_INVALID;

import static android.content.pm.PackageManager.INSTALL_FAILED_SHARED_USER_INCOMPATIBLE;

import static android.content.pm.PackageManager.INSTALL_FAILED_TEST_ONLY;

import static android.content.pm.PackageManager.INSTALL_FAILED_UPDATE_INCOMPATIBLE;
@@ -17123,7 +17123,7 @@ public class PackageManagerService extends IPackageManager.Stub 
        // Sanity check

        if (instantApp && onExternal) {

            Slog.i(TAG, "Incompatible ephemeral install; external=" + onExternal);

            throw new PrepareFailure(PackageManager.INSTALL_FAILED_INSTANT_APP_INVALID);

            throw new PrepareFailure(PackageManager.INSTALL_FAILED_SESSION_INVALID);

        }















        // Retrieve PackageSettings and parse package









@@ -17148,13 +17148,13 @@ public class PackageManagerService extends IPackageManager.Stub













            if (parsedPackage.getTargetSdkVersion() < Build.VERSION_CODES.O) {















                Slog.w(TAG, "Instant app package " + parsedPackage.getPackageName()















                                + " does not target at least O");













                throw new PrepareFailure(INSTALL_FAILED_INSTANT_APP_INVALID,













                throw new PrepareFailure(INSTALL_FAILED_SESSION_INVALID,















                        "Instant app package must target at least O");















            }















            if (parsedPackage.getSharedUserId() != null) {















                Slog.w(TAG, "Instant app package " + parsedPackage.getPackageName()















                        + " may not declare sharedUserId.");













                throw new PrepareFailure(INSTALL_FAILED_INSTANT_APP_INVALID,













                throw new PrepareFailure(INSTALL_FAILED_SESSION_INVALID,















                        "Instant app package may not declare a sharedUserId");















            }















        }










@@ -17194,7 +17194,7 @@ public class PackageManagerService extends IPackageManager.Stub













                < SignatureSchemeVersion.SIGNING_BLOCK_V2) {















            Slog.w(TAG, "Instant app package " + parsedPackage.getPackageName()















                    + " is not signed with at least APK Signature Scheme v2");













            throw new PrepareFailure(INSTALL_FAILED_INSTANT_APP_INVALID,













            throw new PrepareFailure(INSTALL_FAILED_SESSION_INVALID,















                    "Instant app package must be signed with APK Signature Scheme v2 or greater");















        }
























@@ -17400,7 +17400,7 @@ public class PackageManagerService extends IPackageManager.Stub













                        "Cannot install updates to system apps on sdcard");















            } else if (instantApp) {















                // Abort update; system app can't be replaced with an instant app













                throw new PrepareFailure(INSTALL_FAILED_INSTANT_APP_INVALID,













                throw new PrepareFailure(INSTALL_FAILED_SESSION_INVALID,















                        "Cannot update a system app with an instant app");















            }















        }










@@ -17592,7 +17592,7 @@ public class PackageManagerService extends IPackageManager.Stub













                                            "Can't replace full app with instant app: " + pkgName11















                                                    + " for user: " + currentUser);















                                    throw new PrepareFailure(













                                            PackageManager.INSTALL_FAILED_INSTANT_APP_INVALID);













                                            PackageManager.INSTALL_FAILED_SESSION_INVALID);















                                }















                            }















                        } else if (!ps.getInstantApp(args.user.getIdentifier())) {









@@ -17600,7 +17600,7 @@ public class PackageManagerService extends IPackageManager.Stub













                            Slog.w(TAG, "Can't replace full app with instant app: " + pkgName11















                                    + " for user: " + args.user.getIdentifier());















                            throw new PrepareFailure(













                                    PackageManager.INSTALL_FAILED_INSTANT_APP_INVALID);













                                    PackageManager.INSTALL_FAILED_SESSION_INVALID);















                        }















                    }















                }