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

Commit efb240ee authored by Jing Ji's avatar Jing Ji
Browse files

Make sure to stop the background services even if it's never active 

If the process is started as the background process state, its
background services were not getting stopped after 60s because
there's no foreground to background change event. Now fix this issue.

Bug: 322928585
Test: Manual - start a BG service and wait for 60s
Change-Id: I7a219f0420c8de582918ffaab603ac0a1a44d49e
parent 3b8bcbc9

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

+9 −2
Original line number Diff line number Diff line
@@ -1499,8 +1499,12 @@ public class OomAdjuster { 
                            && !uidRec.isCurAllowListed()) {

                        // UID is now in the background (and not on the temp allowlist).  Was it

                        // previously in the foreground (or on the temp allowlist)?

                        // Or, it wasn't in the foreground / allowlist, but its last background

                        // timestamp is also 0, this means it's never been in the

                        // foreground / allowlist since it's born at all.

                        if (!ActivityManager.isProcStateBackground(uidRec.getSetProcState())

                                || uidRec.isSetAllowListed()) {

                                || uidRec.isSetAllowListed()

                                || uidRec.getLastBackgroundTime() == 0) {

                            uidRec.setLastBackgroundTime(nowElapsed);

                            if (mService.mDeterministicUidIdle

                                    || !mService.mHandler.hasMessages(IDLE_UIDS_MSG)) {
@@ -1526,6 +1530,7 @@ public class OomAdjuster { 
                            uidRec.setIdle(false);

                        }

                        uidRec.setLastBackgroundTime(0);

                        uidRec.setLastIdleTime(0);

                    }

                    final boolean wasCached = uidRec.getSetProcState()

                            > ActivityManager.PROCESS_STATE_RECEIVER;
@@ -3700,12 +3705,14 @@ public class OomAdjuster { 
        for (int i = N - 1; i >= 0; i--) {

            final UidRecord uidRec = mActiveUids.valueAt(i);

            final long bgTime = uidRec.getLastBackgroundTime();

            if (bgTime > 0 && !uidRec.isIdle()) {

            final long idleTime = uidRec.getLastIdleTime();

            if (bgTime > 0 && (!uidRec.isIdle() || idleTime == 0)) {

                if (bgTime <= maxBgTime) {

                    EventLogTags.writeAmUidIdle(uidRec.getUid());

                    synchronized (mProcLock) {

                        uidRec.setIdle(true);

                        uidRec.setSetIdle(true);

                        uidRec.setLastIdleTime(nowElapsed);

                    }

                    mService.doStopUidLocked(uidRec.getUid(), uidRec);

                } else {

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

+13 −0
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ public final class UidRecord { 
    @CompositeRWLock({"mService", "mProcLock"})

    private long mLastBackgroundTime;



    @CompositeRWLock({"mService", "mProcLock"})

    private long mLastIdleTime;



    @CompositeRWLock({"mService", "mProcLock"})

    private boolean mEphemeral;
@@ -254,6 +257,16 @@ public final class UidRecord { 
        mLastBackgroundTime = lastBackgroundTime;

    }



    @GuardedBy(anyOf = {"mService", "mProcLock"})

    long getLastIdleTime() {

        return mLastIdleTime;

    }



    @GuardedBy({"mService", "mProcLock"})

    void setLastIdleTime(long lastActiveTime) {

        mLastIdleTime = lastActiveTime;

    }



    @GuardedBy(anyOf = {"mService", "mProcLock"})

    boolean isEphemeral() {

        return mEphemeral;