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

Commit 7c8cc6bf authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Check if app's ntwk state will be changed before updating procstate."... 

Merge "Check if app's ntwk state will be changed before updating procstate." am: 36b9bc8e am: a27cba0c am: afbfc9f7

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

Change-Id: I8f9d72abb45b1ca508b36adec00ff4e87193e6d4
parents 162255ae afbfc9f7

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

+5 −3
Original line number Diff line number Diff line
@@ -407,7 +407,6 @@ public class OomAdjuster { 
                uids.clear();

                uids.put(uidRec.getUid(), uidRec);

                updateUidsLSP(uids, SystemClock.elapsedRealtime());

                mProcessList.incrementProcStateSeqAndNotifyAppsLOSP(uids);

            }

        }
@@ -1144,8 +1143,6 @@ public class OomAdjuster { 
            }

        }



        mProcessList.incrementProcStateSeqAndNotifyAppsLOSP(activeUids);



        return mService.mAppProfiler.updateLowMemStateLSP(numCached, numEmpty, numTrimming);

    }
@@ -1180,6 +1177,11 @@ public class OomAdjuster { 


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

    private void updateUidsLSP(ActiveUids activeUids, final long nowElapsed) {

        // This compares previously set procstate to the current procstate in regards to whether

        // or not the app's network access will be blocked. So, this needs to be called before

        // we update the UidRecord's procstate by calling {@link UidRecord#setSetProcState}.

        mProcessList.incrementProcStateSeqAndNotifyAppsLOSP(activeUids);



        ArrayList<UidRecord> becameIdle = mTmpBecameIdle;

        becameIdle.clear();