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

Commit df70c69e authored by Tim Murray's avatar Tim Murray Committed by Android (Google) Code Review
Browse files

Merge changes Iaceb2b7c,I27aa4860,Ic650456a into sc-dev 

* changes:
  BackgroundDexOptService: defer post-boot job further
  ActivityManagerService: don't compact system at BOOT_COMPLETED
  CachedAppOptimizer: don't take AM lock when freezer is not enabled
parents 0ac1939c 09778808

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −1
Original line number Diff line number Diff line
@@ -4509,7 +4509,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
                                String data, Bundle extras, boolean ordered,

                                boolean sticky, int sendingUser) {

                            synchronized (ActivityManagerService.this) {

                                mOomAdjuster.mCachedAppOptimizer.compactAllSystem();

                                mAppProfiler.requestPssAllProcsLocked(

                                        SystemClock.uptimeMillis(), true, false);

                            }

services/core/java/com/android/server/am/CachedAppOptimizer.java

+6 −4
Original line number Diff line number Diff line
@@ -741,6 +741,7 @@ public final class CachedAppOptimizer { 


    // This will ensure app will be out of the freezer for at least FREEZE_TIMEOUT_MS

    void unfreezeTemporarily(ProcessRecord app) {

        if (mUseFreezer) {

            synchronized (mAm) {

                if (app.frozen) {

                    unfreezeAppLocked(app);
@@ -748,6 +749,7 @@ public final class CachedAppOptimizer { 
                }

            }

        }

    }



    @GuardedBy("mAm")

    void freezeAppAsync(ProcessRecord app) {

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

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ public class BackgroundDexOptService extends JobService { 
        // Schedule a one-off job which scans installed packages and updates

        // out-of-date oat files.

        js.schedule(new JobInfo.Builder(JOB_POST_BOOT_UPDATE, sDexoptServiceName)

                    .setMinimumLatency(TimeUnit.MINUTES.toMillis(1))

                    .setOverrideDeadline(TimeUnit.MINUTES.toMillis(1))

                    .setMinimumLatency(TimeUnit.MINUTES.toMillis(10))

                    .setOverrideDeadline(TimeUnit.MINUTES.toMillis(60))

                    .build());



        // Schedule a daily job which scans installed packages and compiles