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

Commit 2c656d13 authored by Tim Murray's avatar Tim Murray Committed by Automerger Merge Worker
Browse files

Merge changes Iaceb2b7c,I27aa4860,Ic650456a into sc-dev am: df70c69e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420624

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaed1796988e17bfa22071ceaea3713b053bf8d8b
parents 049bbaa9 df70c69e

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

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

                                String data, Bundle extras, boolean ordered,

                                boolean sticky, int sendingUser) {

                                boolean sticky, int sendingUser) {

                            synchronized (ActivityManagerService.this) {

                            synchronized (ActivityManagerService.this) {

                                mOomAdjuster.mCachedAppOptimizer.compactAllSystem();

                                mAppProfiler.requestPssAllProcsLocked(

                                mAppProfiler.requestPssAllProcsLocked(

                                        SystemClock.uptimeMillis(), true, false);

                                        SystemClock.uptimeMillis(), true, false);

                            }

                            }

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

+6 −4
Original line number Original line 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

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

    void unfreezeTemporarily(ProcessRecord app) {

    void unfreezeTemporarily(ProcessRecord app) {

        if (mUseFreezer) {

            synchronized (mAm) {

            synchronized (mAm) {

                if (app.frozen) {

                if (app.frozen) {

                    unfreezeAppLocked(app);

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

                }

            }

            }

        }

        }

    }





    @GuardedBy("mAm")

    @GuardedBy("mAm")

    void freezeAppAsync(ProcessRecord app) {

    void freezeAppAsync(ProcessRecord app) {

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

+2 −2
Original line number Original line 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

        // Schedule a one-off job which scans installed packages and updates

        // out-of-date oat files.

        // out-of-date oat files.

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

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

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

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

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

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

                    .build());

                    .build());





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

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