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

Commit fbc20e9a authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-8bb215cb07a04148a83a1ddbc3dee1d3" 

* changes:
  Merge changes I52110b84,I15d10a19,I5f52b832,Ifbaceb47 am: 803648a9 am: d89768f5 am: 8413d304 am: 8d32fefa
  [automerger skipped] Migrate BackgroundDexOptServiceIntegrationTests to androidx.test am: 3bc264d1 -s ours am: f1383e0c -s ours am: a06b665b -s ours am: e270b113 -s ours am skip reason: change_id I32fe3297656eec6060da6c7e24582bcd5315fb16 with SHA1 502ec7ae is in history
parents 01808e09 dab42543

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

+12 −3
Original line number Diff line number Diff line
@@ -254,9 +254,16 @@ public class BackgroundDexOptService extends JobService { 
            @Override

            public void run() {

                int result = idleOptimization(pm, pkgs, BackgroundDexOptService.this);

                if (result != OPTIMIZE_ABORT_BY_JOB_SCHEDULER) {

                if (result == OPTIMIZE_PROCESSED) {

                    Log.i(TAG, "Idle optimizations completed.");

                } else if (result == OPTIMIZE_ABORT_NO_SPACE_LEFT) {

                    Log.w(TAG, "Idle optimizations aborted because of space constraints.");

                    // If we didn't abort we ran to completion (or stopped because of space).

                } else if (result == OPTIMIZE_ABORT_BY_JOB_SCHEDULER) {

                    Log.w(TAG, "Idle optimizations aborted by job scheduler.");

                } else {

                    Log.w(TAG, "Idle optimizations ended with unexpected code: " + result);

                }

                if (result != OPTIMIZE_ABORT_BY_JOB_SCHEDULER) {

                    // Abandon our timeslice and do not reschedule.

                    jobFinished(jobParams, /* reschedule */ false);

                }
@@ -339,6 +346,7 @@ public class BackgroundDexOptService extends JobService { 
            long lowStorageThreshold, boolean isForPrimaryDex) {

        ArraySet<String> updatedPackages = new ArraySet<>();

        Set<String> unusedPackages = pm.getUnusedPackages(mDowngradeUnusedAppsThresholdInMillis);

        boolean hadSomeLowSpaceFailure = false;

        Log.d(TAG, "Unsused Packages " +  String.join(",", unusedPackages));

        // Only downgrade apps when space is low on device.

        // Threshold is selected above the lowStorageThreshold so that we can pro-actively clean
@@ -359,6 +367,7 @@ public class BackgroundDexOptService extends JobService { 
            } else {

                if (abort_code == OPTIMIZE_ABORT_NO_SPACE_LEFT) {

                    // can't dexopt because of low space.

                    hadSomeLowSpaceFailure = true;

                    continue;

                }

                dex_opt_performed = optimizePackage(pm, pkg, isForPrimaryDex);
@@ -369,7 +378,7 @@ public class BackgroundDexOptService extends JobService { 
        }



        notifyPinService(updatedPackages);

        return OPTIMIZE_PROCESSED;

        return hadSomeLowSpaceFailure ? OPTIMIZE_ABORT_NO_SPACE_LEFT : OPTIMIZE_PROCESSED;

    }