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

Commit 29384f92 authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by Automerger Merge Worker
Browse files

Merge "Init some time Process stats with very negative numbers" into main am: 5a389aa6 

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



Change-Id: I5ed59b883737cb6fd90f75f5ac67ecac8ccb3259
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c81795ea 5a389aa6

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

+1 −2
Original line number Diff line number Diff line
@@ -2712,8 +2712,7 @@ public class OomAdjuster { 
            }

        }



        if (ppr.getLastProviderTime() > 0

                && (ppr.getLastProviderTime() + mConstants.CONTENT_PROVIDER_RETAIN_TIME) > now) {

        if ((ppr.getLastProviderTime() + mConstants.CONTENT_PROVIDER_RETAIN_TIME) > now) {

            if (adj > PREVIOUS_APP_ADJ) {

                adj = PREVIOUS_APP_ADJ;

                schedGroup = SCHED_GROUP_BACKGROUND;

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ final class ProcessProviderRecord { 
    /**

     * The last time someone else was using a provider in this process.

     */

    private long mLastProviderTime;

    private long mLastProviderTime = Long.MIN_VALUE;



    /**

     * class (String) -> ContentProviderRecord.

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

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ final class ProcessStateRecord { 
     * The last time the process was in the TOP state or greater.

     */

    @GuardedBy("mService")

    private long mLastTopTime;

    private long mLastTopTime = Long.MIN_VALUE;



    /**

     * Is this an empty background process?

services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java

+1 −1
Original line number Diff line number Diff line
@@ -2553,7 +2553,7 @@ public class MockingOomAdjusterTests { 
                PROCESS_STATE_NONEXISTENT, PROCESS_STATE_NONEXISTENT,

                0, 0, false, false, false, ServiceInfo.FOREGROUND_SERVICE_TYPE_NONE,

                false, false, false, hasShownUi, false, false, false, false, false, false, null,

                0, 0, 0, true, 0, null, false);

                0, Long.MIN_VALUE, Long.MIN_VALUE, true, 0, null, false);

    }



    private ProcessRecord makeProcessRecord(ActivityManagerService service, int pid, int uid,