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

Commit ba21606a authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Automerger Merge Worker
Browse files

Merge changes I17005aae,Iae30a508 into udc-dev am: 02069e3f 

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



Change-Id: I1ac890599fbbc8b7578ffa57530f1551bcf4de4c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73a810b4 02069e3f

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

+1 −1
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ final class ActivityManagerConstants extends ContentObserver { 
    private static final String KEY_ENABLE_WAIT_FOR_FINISH_ATTACH_APPLICATION =

            "enable_wait_for_finish_attach_application";



    private static final boolean DEFAULT_ENABLE_WAIT_FOR_FINISH_ATTACH_APPLICATION = false;

    private static final boolean DEFAULT_ENABLE_WAIT_FOR_FINISH_ATTACH_APPLICATION = true;



    /** @see #KEY_ENABLE_WAIT_FOR_FINISH_ATTACH_APPLICATION */

    public volatile boolean mEnableWaitForFinishAttachApplication =

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

+7 −9
Original line number Diff line number Diff line
@@ -4925,14 +4925,8 @@ public class ActivityManagerService extends IActivityManager.Stub 
        EventLogTags.writeAmProcBound(app.userId, pid, app.processName);















        synchronized (mProcLock) {













            app.mState.setCurAdj(ProcessList.INVALID_ADJ);













            app.mState.setSetAdj(ProcessList.INVALID_ADJ);













            app.mState.setVerifiedAdj(ProcessList.INVALID_ADJ);













            mOomAdjuster.setAttachingSchedGroupLSP(app);













            app.mState.setForcingToImportant(null);













            mOomAdjuster.setAttachingProcessStatesLSP(app);















            clearProcessForegroundLocked(app);













            app.mState.setHasShownUi(false);













            app.mState.setCached(false);















            app.setDebugging(false);















            app.setKilledByAm(false);















            app.setKilled(false);










@@ -5100,8 +5094,14 @@ public class ActivityManagerService extends IActivityManager.Stub













                app.makeActive(thread, mProcessStats);















                checkTime(startTime, "attachApplicationLocked: immediately after bindApplication");















            }













            app.setPendingFinishAttach(true);



























            updateLruProcessLocked(app, false, null);















            checkTime(startTime, "attachApplicationLocked: after updateLruProcessLocked");

























            updateOomAdjLocked(app, OomAdjuster.OOM_ADJ_REASON_PROCESS_BEGIN);













            checkTime(startTime, "attachApplicationLocked: after updateOomAdjLocked");



























            final long now = SystemClock.uptimeMillis();















            synchronized (mAppProfiler.mProfilerLock) {















                app.mProfile.setLastRequestedGc(now);









@@ -5117,8 +5117,6 @@ public class ActivityManagerService extends IActivityManager.Stub



























            if (!mConstants.mEnableWaitForFinishAttachApplication) {















                finishAttachApplicationInner(startSeq, callingUid, pid);













            } else {













                app.setPendingFinishAttach(true);















            }















        } catch (Exception e) {















            // We need kill the process group here. (b/148588589)

































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



+31
−2




























Original line number
Diff line number
Diff line








@@ -1259,12 +1259,19 @@ public class OomAdjuster {













        for (int i = numLru - 1; i >= 0; i--) {















            ProcessRecord app = lruList.get(i);















            final ProcessStateRecord state = app.mState;













            if (!app.isKilledByAm() && app.getThread() != null && !app.isPendingFinishAttach()) {













            if (!app.isKilledByAm() && app.getThread() != null) {















                // We don't need to apply the update for the process which didn't get computed















                if (state.getCompletedAdjSeq() == mAdjSeq) {















                    applyOomAdjLSP(app, true, now, nowElapsed, oomAdjReason);















                }





























                if (app.isPendingFinishAttach()) {













                    // Avoid trimming processes that are still initializing. If they aren't













                    // hosting any components yet because they may be unfairly killed.













                    // We however apply any computed previously computed oom scores before skipping.













                    continue;













                }





























                final ProcessServiceRecord psr = app.mServices;















                // Count the number of process types.















                switch (state.getCurProcState()) {










@@ -1698,6 +1705,19 @@ public class OomAdjuster {













            return false;















        }





























        if (app.isPendingFinishAttach()) {













            state.setAdjSeq(mAdjSeq);













            state.setCompletedAdjSeq(mAdjSeq);













            // If the process is still initializing, we skip computing any states because we













            // don't want to override the special states that have been set at













            // AMS#attachApplication with OomAdjuster#setAttachingProcessStates.













            // In this limbo state, the app has |PROC_START_TIMEOUT| to finish attach application













            // and receive updated proc_state based on its importance.













            // Note that in this state, the oom_score is INVALID_ADJ which is outside the standard













            // oom score range and the app is safe from lmkd kills.













            return false;













        }





























        state.setAdjTypeCode(ActivityManager.RunningAppProcessInfo.REASON_UNKNOWN);















        state.setAdjSource(null);















        state.setAdjTarget(null);










@@ -3211,7 +3231,7 @@ public class OomAdjuster {













    }































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













    void setAttachingSchedGroupLSP(ProcessRecord app) {













    void setAttachingProcessStatesLSP(ProcessRecord app) {















        int initialSchedGroup = SCHED_GROUP_DEFAULT;















        final ProcessStateRecord state = app.mState;















        // If the process has been marked as foreground, it is starting as the top app (with









@@ -3231,6 +3251,15 @@ public class OomAdjuster {





























        state.setSetSchedGroup(initialSchedGroup);















        state.setCurrentSchedulingGroup(initialSchedGroup);













        state.setCurProcState(PROCESS_STATE_CACHED_EMPTY);













        state.setCurCapability(PROCESS_CAPABILITY_NONE);



























        state.setCurAdj(ProcessList.FOREGROUND_APP_ADJ);













        state.setSetAdj(ProcessList.FOREGROUND_APP_ADJ);













        state.setVerifiedAdj(ProcessList.FOREGROUND_APP_ADJ);













        state.setForcingToImportant(null);













        state.setHasShownUi(false);













        state.setCached(true);















    }































    // ONLY used for unit testing in OomAdjusterTests.java

































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



+30
−0




























Original line number
Diff line number
Diff line








@@ -1966,6 +1966,36 @@ public class MockingOomAdjusterTests {













        assertBfsl(app1);















    }





























    @SuppressWarnings("GuardedBy")













    @Test













    public void testUpdateOomAdj_DoOne_PendingFinishAttach() {













        ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,













                MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, false));













        app.setPendingFinishAttach(true);













        app.mState.setHasForegroundActivities(false);



























        sService.mOomAdjuster.setAttachingProcessStatesLSP(app);













        updateOomAdj(app);



























        assertProcStates(app, PROCESS_STATE_CACHED_EMPTY, FOREGROUND_APP_ADJ,













                SCHED_GROUP_DEFAULT);













    }



























    @SuppressWarnings("GuardedBy")













    @Test













    public void testUpdateOomAdj_DoOne_TopApp_PendingFinishAttach() {













        ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,













                MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, false));













        app.setPendingFinishAttach(true);













        app.mState.setHasForegroundActivities(true);



























        sService.mOomAdjuster.setAttachingProcessStatesLSP(app);













        updateOomAdj(app);



























        assertProcStates(app, PROCESS_STATE_CACHED_EMPTY, FOREGROUND_APP_ADJ,













                SCHED_GROUP_TOP_APP);













    }





























    @SuppressWarnings("GuardedBy")















    @Test















    public void testUpdateOomAdj_UidIdle_StopService() {