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

Commit 95349c0e authored by Andreas Gampe's avatar Andreas Gampe
Browse files

OtaDexOptService: Log post-reboot moves 

Disable artifact checks for non-upgrade booting. Log the number of
successfully move artifacts.

Bug: 37158297
Test: m
Test: manual
Change-Id: Ic81531950582ce937e2e3b7815fb9132888d9a42
parent c4ea961f

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

+13 −3
Original line number Diff line number Diff line
@@ -94,9 +94,6 @@ public class OtaDexoptService extends IOtaDexopt.Stub { 
    public OtaDexoptService(Context context, PackageManagerService packageManagerService) {

        this.mContext = context;

        this.mPackageManagerService = packageManagerService;



        // Now it's time to check whether we need to move any A/B artifacts.

        moveAbArtifacts(packageManagerService.mInstaller);

    }



    public static OtaDexoptService main(Context context,
@@ -104,6 +101,9 @@ public class OtaDexoptService extends IOtaDexopt.Stub { 
        OtaDexoptService ota = new OtaDexoptService(context, packageManagerService);

        ServiceManager.addService("otadexopt", ota);



        // Now it's time to check whether we need to move any A/B artifacts.

        ota.moveAbArtifacts(packageManagerService.mInstaller);



        return ota;

    }
@@ -330,8 +330,15 @@ public class OtaDexoptService extends IOtaDexopt.Stub { 
            throw new IllegalStateException("Should not be ota-dexopting when trying to move.");

        }



        if (!mPackageManagerService.isUpgrade()) {

            Slog.d(TAG, "No upgrade, skipping A/B artifacts check.");

            return;

        }



        // Look into all packages.

        Collection<PackageParser.Package> pkgs = mPackageManagerService.getPackages();

        int packagePaths = 0;

        int pathsSuccessful = 0;

        for (PackageParser.Package pkg : pkgs) {

            if (pkg == null) {

                continue;
@@ -362,13 +369,16 @@ public class OtaDexoptService extends IOtaDexopt.Stub { 


                    // TODO: Check first whether there is an artifact, to save the roundtrip time.



                    packagePaths++;

                    try {

                        installer.moveAb(path, dexCodeInstructionSet, oatDir);

                        pathsSuccessful++;

                    } catch (InstallerException e) {

                    }

                }

            }

        }

        Slog.i(TAG, "Moved " + pathsSuccessful + "/" + packagePaths);

    }



    /**