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

Commit c6540daf authored by Calin Juravle's avatar Calin Juravle
Browse files

Fix package install flow w.r.t. dexopt 

Calling dexopt before the applicationInfo gets the uid is wrong.
Dexopt needs to be able to set the GID of the odex file to the
UserHandle.getSharedAppGid(pkg.applicationInfo.uid) and that is
possible only with a valid uid.

Move the dexopt logic after installNewPackageLIF/replacePackageLIF
to ensure that we get a valid uid.

Bug: 69331247
Test: adb install & check the GID of the compiler artifacts
Change-Id: I2434a1a0b9015091a9af2009b3f785b7a16e1256
parent 3b1b2825

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

+7 −0
Original line number Diff line number Diff line
@@ -128,6 +128,10 @@ public class PackageDexOptimizer { 
    int performDexOpt(PackageParser.Package pkg, String[] sharedLibraries,

            String[] instructionSets, CompilerStats.PackageStats packageStats,

            PackageDexUsage.PackageUseInfo packageUseInfo, DexoptOptions options) {

        if (pkg.applicationInfo.uid == -1) {

            throw new IllegalArgumentException("Dexopt for " + pkg.packageName

                    + " has invalid uid.");

        }

        if (!canOptimizePackage(pkg)) {

            return DEX_OPT_SKIPPED;

        }
@@ -299,6 +303,9 @@ public class PackageDexOptimizer { 
     */

    public int dexOptSecondaryDexPath(ApplicationInfo info, String path,

            PackageDexUsage.DexUseInfo dexUseInfo, DexoptOptions options) {

        if (info.uid == -1) {

            throw new IllegalArgumentException("Dexopt for path " + path + " has invalid uid.");

        }

        synchronized (mInstallLock) {

            final long acquireTime = acquireWakeLockLI(info.uid);

            try {

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

+49 −44
Original line number Diff line number Diff line
@@ -16508,10 +16508,45 @@ public class PackageManagerService extends IPackageManager.Stub 
            return;

        }













        // Verify if we need to dexopt the app.













        if (!instantApp) {













            startIntentFilterVerifications(args.user.getIdentifier(), replace, pkg);













        } else {













            if (DEBUG_DOMAIN_VERIFICATION) {













                Slog.d(TAG, "Not verifying instant app install for app links: " + pkgName);













            }













        }

























        try (PackageFreezer freezer = freezePackageForInstall(pkgName, installFlags,













                "installPackageLI")) {













            if (replace) {













                if (pkg.applicationInfo.isStaticSharedLibrary()) {













                    // Static libs have a synthetic package name containing the version













                    // and cannot be updated as an update would get a new package name,













                    // unless this is the exact same version code which is useful for













                    // development.













                    PackageParser.Package existingPkg = mPackages.get(pkg.packageName);













                    if (existingPkg != null && existingPkg.mVersionCode != pkg.mVersionCode) {













                        res.setError(INSTALL_FAILED_DUPLICATE_PACKAGE, "Packages declaring "













                                + "static-shared libs cannot be updated");













                        return;













                    }













                }













                replacePackageLIF(pkg, parseFlags, scanFlags, args.user,













                        installerPackageName, res, args.installReason);













            } else {













                installNewPackageLIF(pkg, parseFlags, scanFlags | SCAN_DELETE_DATA_ON_FAILURES,













                        args.user, installerPackageName, volumeUuid, res, args.installReason);













            }













        }

























        // Check whether we need to dexopt the app.















        //













        // NOTE: it is *important* to call dexopt after doRename which will sync the













        // package data from PackageParser.Package and its corresponding ApplicationInfo.













        // NOTE: it is IMPORTANT to call dexopt:













        //   - after doRename which will sync the package data from PackageParser.Package and its













        //     corresponding ApplicationInfo.













        //   - after installNewPackageLIF or replacePackageLIF which will update result with the













        //     uid of the application (pkg.applicationInfo.uid).













        //     This update happens in place!















        //















        // We only need to dexopt if the package meets ALL of the following conditions:















        //   1) it is not forward locked.









@@ -16524,7 +16559,8 @@ public class PackageManagerService extends IPackageManager.Stub













        // continuous progress to the useur instead of mysteriously blocking somewhere in the















        // middle of running an instant app. The default behaviour can be overridden















        // via gservices.













        final boolean performDexopt = !forwardLocked













        final boolean performDexopt = (res.returnCode == PackageManager.INSTALL_SUCCEEDED)













                && !forwardLocked















                && !pkg.applicationInfo.isExternalAsec()















                && (!instantApp || Global.getInt(mContext.getContentResolver(),















                Global.INSTANT_APP_DEXOPT_ENABLED, 0) != 0);










@@ -16552,37 +16588,6 @@ public class PackageManagerService extends IPackageManager.Stub













        // TODO: Layering violation















        BackgroundDexOptService.notifyPackageChanged(pkg.packageName);



























        if (!instantApp) {













            startIntentFilterVerifications(args.user.getIdentifier(), replace, pkg);













        } else {













            if (DEBUG_DOMAIN_VERIFICATION) {













                Slog.d(TAG, "Not verifying instant app install for app links: " + pkgName);













            }













        }

























        try (PackageFreezer freezer = freezePackageForInstall(pkgName, installFlags,













                "installPackageLI")) {













            if (replace) {













                if (pkg.applicationInfo.isStaticSharedLibrary()) {













                    // Static libs have a synthetic package name containing the version













                    // and cannot be updated as an update would get a new package name,













                    // unless this is the exact same version code which is useful for













                    // development.













                    PackageParser.Package existingPkg = mPackages.get(pkg.packageName);













                    if (existingPkg != null && existingPkg.mVersionCode != pkg.mVersionCode) {













                        res.setError(INSTALL_FAILED_DUPLICATE_PACKAGE, "Packages declaring "













                                + "static-shared libs cannot be updated");













                        return;













                    }













                }













                replacePackageLIF(pkg, parseFlags, scanFlags, args.user,













                        installerPackageName, res, args.installReason);













            } else {













                installNewPackageLIF(pkg, parseFlags, scanFlags | SCAN_DELETE_DATA_ON_FAILURES,













                        args.user, installerPackageName, volumeUuid, res, args.installReason);













            }













        }



























        synchronized (mPackages) {















            final PackageSetting ps = mSettings.mPackages.get(pkgName);















            if (ps != null) {