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

Commit c99b3935 authored by Andreas Gampe's avatar Andreas Gampe Committed by The Android Automerger
Browse files

Frameworks/base: Propagate boot status to installd 

Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.

Bug: 23898216
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
parent 5c4a86f7

core/java/com/android/internal/os/InstallerConnection.java

+4 −3
Original line number Diff line number Diff line
@@ -92,14 +92,14 @@ public class InstallerConnection { 
    }



    public int dexopt(String apkPath, int uid, boolean isPublic,

            String instructionSet, int dexoptNeeded) {

            String instructionSet, int dexoptNeeded, boolean bootComplete) {

        return dexopt(apkPath, uid, isPublic, "*", instructionSet, dexoptNeeded,

                false, false, null);

                false, false, null, bootComplete);

    }



    public int dexopt(String apkPath, int uid, boolean isPublic, String pkgName,

            String instructionSet, int dexoptNeeded, boolean vmSafeMode,

            boolean debuggable, String outputPath) {

            boolean debuggable, String outputPath, boolean bootComplete) {

        StringBuilder builder = new StringBuilder("dexopt");

        builder.append(' ');

        builder.append(apkPath);
@@ -116,6 +116,7 @@ public class InstallerConnection { 
        builder.append(debuggable ? " 1" : " 0");

        builder.append(' ');

        builder.append(outputPath != null ? outputPath : "!");

        builder.append(bootComplete ? " 1" : " 0");

        return execute(builder.toString());

    }

core/java/com/android/internal/os/ZygoteInit.java

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ public class ZygoteInit { 
                        classPathElement, "*", instructionSet, false /* defer */);

                if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {

                    installer.dexopt(classPathElement, Process.SYSTEM_UID, false,

                            instructionSet, dexoptNeeded);

                            instructionSet, dexoptNeeded, false /* boot complete */);

                }

            }

        } catch (IOException ioe) {

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

+15 −2
Original line number Diff line number Diff line
@@ -77,24 +77,37 @@ public final class Installer extends SystemService { 


    public int dexopt(String apkPath, int uid, boolean isPublic,

            String instructionSet, int dexoptNeeded) {

        return dexopt(apkPath, uid, isPublic, instructionSet, dexoptNeeded, true);

    }



    public int dexopt(String apkPath, int uid, boolean isPublic,

            String instructionSet, int dexoptNeeded, boolean bootComplete) {

        if (!isValidInstructionSet(instructionSet)) {

            Slog.e(TAG, "Invalid instruction set: " + instructionSet);

            return -1;

        }



        return mInstaller.dexopt(apkPath, uid, isPublic, instructionSet, dexoptNeeded);

        return mInstaller.dexopt(apkPath, uid, isPublic, instructionSet, dexoptNeeded,

                bootComplete);

    }



    public int dexopt(String apkPath, int uid, boolean isPublic, String pkgName,

            String instructionSet, int dexoptNeeded, boolean vmSafeMode,

            boolean debuggable, @Nullable String outputPath) {

        return dexopt(apkPath, uid, isPublic, pkgName, instructionSet, dexoptNeeded, vmSafeMode,

                debuggable, outputPath, true);

    }



    public int dexopt(String apkPath, int uid, boolean isPublic, String pkgName,

            String instructionSet, int dexoptNeeded, boolean vmSafeMode,

            boolean debuggable, @Nullable String outputPath, boolean bootComplete) {

        if (!isValidInstructionSet(instructionSet)) {

            Slog.e(TAG, "Invalid instruction set: " + instructionSet);

            return -1;

        }

        return mInstaller.dexopt(apkPath, uid, isPublic, pkgName,

                instructionSet, dexoptNeeded, vmSafeMode,

                debuggable, outputPath);

                debuggable, outputPath, bootComplete);

    }



    public int idmap(String targetApkPath, String overlayApkPath, int uid) {

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

+10 −9
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ final class PackageDexOptimizer { 
     * {@link PackageManagerService#mInstallLock}.

     */

    int performDexOpt(PackageParser.Package pkg, String[] instructionSets,

            boolean forceDex, boolean defer, boolean inclDependencies) {

            boolean forceDex, boolean defer, boolean inclDependencies, boolean bootComplete) {

        ArraySet<String> done;

        if (inclDependencies && (pkg.usesLibraries != null || pkg.usesOptionalLibraries != null)) {

            done = new ArraySet<String>();
@@ -86,7 +86,7 @@ final class PackageDexOptimizer { 
                mDexoptWakeLock.acquire();

            }

            try {

                return performDexOptLI(pkg, instructionSets, forceDex, defer, done);

                return performDexOptLI(pkg, instructionSets, forceDex, defer, bootComplete, done);

            } finally {

                if (useLock) {

                    mDexoptWakeLock.release();
@@ -96,18 +96,19 @@ final class PackageDexOptimizer { 
    }



    private int performDexOptLI(PackageParser.Package pkg, String[] targetInstructionSets,

            boolean forceDex, boolean defer, ArraySet<String> done) {

            boolean forceDex, boolean defer, boolean bootComplete, ArraySet<String> done) {

        final String[] instructionSets = targetInstructionSets != null ?

                targetInstructionSets : getAppDexInstructionSets(pkg.applicationInfo);



        if (done != null) {

            done.add(pkg.packageName);

            if (pkg.usesLibraries != null) {

                performDexOptLibsLI(pkg.usesLibraries, instructionSets, forceDex, defer, done);

                performDexOptLibsLI(pkg.usesLibraries, instructionSets, forceDex, defer,

                        bootComplete, done);

            }

            if (pkg.usesOptionalLibraries != null) {

                performDexOptLibsLI(pkg.usesOptionalLibraries, instructionSets, forceDex, defer,

                        done);

                        bootComplete, done);

            }

        }
@@ -174,11 +175,11 @@ final class PackageDexOptimizer { 
                    Log.i(TAG, "Running dexopt (" + dexoptType + ") on: " + path + " pkg="

                            + pkg.applicationInfo.packageName + " isa=" + dexCodeInstructionSet

                            + " vmSafeMode=" + vmSafeMode + " debuggable=" + debuggable

                            + " oatDir = " + oatDir);

                            + " oatDir = " + oatDir + " bootComplete=" + bootComplete);

                    final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);

                    final int ret = mPackageManagerService.mInstaller.dexopt(path, sharedGid,

                            !pkg.isForwardLocked(), pkg.packageName, dexCodeInstructionSet,

                            dexoptNeeded, vmSafeMode, debuggable, oatDir);

                            dexoptNeeded, vmSafeMode, debuggable, oatDir, bootComplete);



                    // Dex2oat might fail due to compiler / verifier errors. We soldier on

                    // regardless, and attempt to interpret the app as a safety net.
@@ -235,12 +236,12 @@ final class PackageDexOptimizer { 
    }



    private void performDexOptLibsLI(ArrayList<String> libs, String[] instructionSets,

            boolean forceDex, boolean defer, ArraySet<String> done) {

            boolean forceDex, boolean defer, boolean bootComplete, ArraySet<String> done) {

        for (String libName : libs) {

            PackageParser.Package libPkg = mPackageManagerService.findSharedNonSystemLibrary(

                    libName);

            if (libPkg != null && !done.contains(libName)) {

                performDexOptLI(libPkg, instructionSets, forceDex, defer, done);

                performDexOptLI(libPkg, instructionSets, forceDex, defer, bootComplete, done);

            }

        }

    }

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

+21 −12
Original line number Diff line number Diff line
@@ -1979,7 +1979,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                            int dexoptNeeded = DexFile.getDexOptNeeded(lib, null, dexCodeInstructionSet, false);

                            if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {

                                alreadyDexOpted.add(lib);

                                mInstaller.dexopt(lib, Process.SYSTEM_UID, true, dexCodeInstructionSet, dexoptNeeded);

                                mInstaller.dexopt(lib, Process.SYSTEM_UID, true, dexCodeInstructionSet, dexoptNeeded, false);

                            }

                        } catch (FileNotFoundException e) {

                            Slog.w(TAG, "Library not found: " + lib);
@@ -2027,7 +2027,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                        try {

                            int dexoptNeeded = DexFile.getDexOptNeeded(path, null, dexCodeInstructionSet, false);

                            if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {

                                mInstaller.dexopt(path, Process.SYSTEM_UID, true, dexCodeInstructionSet, dexoptNeeded);

                                mInstaller.dexopt(path, Process.SYSTEM_UID, true, dexCodeInstructionSet, dexoptNeeded, false);

                            }

                        } catch (FileNotFoundException e) {

                            Slog.w(TAG, "Jar not found: " + path);
@@ -2256,7 +2256,8 @@ public class PackageManagerService extends IPackageManager.Stub { 
                // the rest of the commands above) because there's precious little we

                // can do about it. A settings error is reported, though.

                adjustCpuAbisForSharedUserLPw(setting.packages, null /* scanned package */,

                        false /* force dexopt */, false /* defer dexopt */);

                        false /* force dexopt */, false /* defer dexopt */,

                        false /* boot complete */);

            }















            // Now that we know all the packages we are keeping,










@@ -6208,7 +6209,8 @@ public class PackageManagerService extends IPackageManager.Stub {













        PackageParser.Package p = pkg;















        synchronized (mInstallLock) {















            mPackageDexOptimizer.performDexOpt(p, null /* instruction sets */,













                    false /* force dex */, false /* defer */, true /* include dependencies */);













                    false /* force dex */, false /* defer */, true /* include dependencies */,













                    false /* boot complete */);















        }















    }
























@@ -6251,7 +6253,8 @@ public class PackageManagerService extends IPackageManager.Stub {













            synchronized (mInstallLock) {















                final String[] instructionSets = new String[] { targetInstructionSet };















                int result = mPackageDexOptimizer.performDexOpt(p, instructionSets,













                        false /* forceDex */, false /* defer */, true /* inclDependencies */);













                        false /* forceDex */, false /* defer */, true /* inclDependencies */,













                        true /* boot complete */);















                return result == PackageDexOptimizer.DEX_OPT_PERFORMED;















            }















        } finally {










@@ -6298,7 +6301,8 @@ public class PackageManagerService extends IPackageManager.Stub {













            final String[] instructionSets = new String[] {















                    getPrimaryInstructionSet(pkg.applicationInfo) };















            final int res = mPackageDexOptimizer.performDexOpt(pkg, instructionSets,













                    true /*forceDex*/, false /* defer */, true /* inclDependencies */);













                    true /*forceDex*/, false /* defer */, true /* inclDependencies */,













                    true /* boot complete */);















            if (res != PackageDexOptimizer.DEX_OPT_PERFORMED) {















                throw new IllegalStateException("Failed to dexopt: " + res);















            }










@@ -7090,12 +7094,13 @@ public class PackageManagerService extends IPackageManager.Stub {













            // we can avoid redundant dexopts, and also to make sure we've got the















            // code and package path correct.















            adjustCpuAbisForSharedUserLPw(pkgSetting.sharedUser.packages,













                    pkg, forceDex, (scanFlags & SCAN_DEFER_DEX) != 0);













                    pkg, forceDex, (scanFlags & SCAN_DEFER_DEX) != 0, true /* boot complete */);















        }





























        if ((scanFlags & SCAN_NO_DEX) == 0) {















            int result = mPackageDexOptimizer.performDexOpt(pkg, null /* instruction sets */,













                    forceDex, (scanFlags & SCAN_DEFER_DEX) != 0, false /* inclDependencies */);













                    forceDex, (scanFlags & SCAN_DEFER_DEX) != 0, false /* inclDependencies */,













                    (scanFlags & SCAN_BOOTING) == 0);















            if (result == PackageDexOptimizer.DEX_OPT_FAILED) {















                throw new PackageManagerException(INSTALL_FAILED_DEXOPT, "scanPackageLI");















            }










@@ -7171,7 +7176,8 @@ public class PackageManagerService extends IPackageManager.Stub {













                    PackageParser.Package clientPkg = clientLibPkgs.get(i);















                    int result = mPackageDexOptimizer.performDexOpt(clientPkg,















                            null /* instruction sets */, forceDex,













                            (scanFlags & SCAN_DEFER_DEX) != 0, false);













                            (scanFlags & SCAN_DEFER_DEX) != 0, false,













                            (scanFlags & SCAN_BOOTING) == 0);















                    if (result == PackageDexOptimizer.DEX_OPT_FAILED) {















                        throw new PackageManagerException(INSTALL_FAILED_DEXOPT,















                                "scanPackageLI failed to dexopt clientLibPkgs");










@@ -7712,7 +7718,8 @@ public class PackageManagerService extends IPackageManager.Stub {













     * adds unnecessary complexity.















     */















    private void adjustCpuAbisForSharedUserLPw(Set<PackageSetting> packagesForUser,













            PackageParser.Package scannedPackage, boolean forceDexOpt, boolean deferDexOpt) {













            PackageParser.Package scannedPackage, boolean forceDexOpt, boolean deferDexOpt,













            boolean bootComplete) {















        String requiredInstructionSet = null;















        if (scannedPackage != null && scannedPackage.applicationInfo.primaryCpuAbi != null) {















            requiredInstructionSet = VMRuntime.getInstructionSet(










@@ -7776,7 +7783,8 @@ public class PackageManagerService extends IPackageManager.Stub {













                        Slog.i(TAG, "Adjusting ABI for : " + ps.name + " to " + adjustedAbi);





























                        int result = mPackageDexOptimizer.performDexOpt(ps.pkg,













                                null /* instruction sets */, forceDexOpt, deferDexOpt, true);













                                null /* instruction sets */, forceDexOpt, deferDexOpt, true,













                                bootComplete);















                        if (result == PackageDexOptimizer.DEX_OPT_FAILED) {















                            ps.primaryCpuAbiString = null;















                            ps.pkg.applicationInfo.primaryCpuAbi = null;










@@ -12376,7 +12384,8 @@ public class PackageManagerService extends IPackageManager.Stub {













            // Run dexopt before old package gets removed, to minimize time when app is unavailable















            int result = mPackageDexOptimizer















                    .performDexOpt(pkg, null /* instruction sets */, false /* forceDex */,













                            false /* defer */, false /* inclDependencies */);













                            false /* defer */, false /* inclDependencies */,













                            true /* boot complete */);















            if (result == PackageDexOptimizer.DEX_OPT_FAILED) {















                res.setError(INSTALL_FAILED_DEXOPT, "Dexopt failed for " + pkg.codePath);















                return;