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

Commit a96aa0c4 authored by Edgar Arriaga García's avatar Edgar Arriaga García Committed by Android (Google) Code Review
Browse files

Merge changes from topic "ea-disable-system-compact" into main 

* changes:
  Disable all processes system compaction during idle maintenance
  Add flag for removing system compaction
parents 32669c5b 12ecc5b6

AconfigFlags.bp

+6 −6
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ aconfig_srcjars = [ 
    ":android.app.flags-aconfig-java{.generated_srcjars}",

    ":android.credentials.flags-aconfig-java{.generated_srcjars}",

    ":android.view.contentprotection.flags-aconfig-java{.generated_srcjars}",

    ":com.android.server.flags.pinner-aconfig-java{.generated_srcjars}",

    ":com.android.server.flags.services-aconfig-java{.generated_srcjars}",

    ":android.service.controls.flags-aconfig-java{.generated_srcjars}",

    ":android.service.voice.flags-aconfig-java{.generated_srcjars}",

    ":android.media.tv.flags-aconfig-java{.generated_srcjars}",
@@ -588,16 +588,16 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Pinner Service

// Server Services Flags

aconfig_declarations {

    name: "com.android.server.flags.pinner-aconfig",

    name: "com.android.server.flags.services-aconfig",

    package: "com.android.server.flags",

    srcs: ["services/core/java/com/android/server/flags/pinner.aconfig"],

    srcs: ["services/core/java/com/android/server/flags/*.aconfig"],

}



java_aconfig_library {

    name: "com.android.server.flags.pinner-aconfig-java",

    aconfig_declarations: "com.android.server.flags.pinner-aconfig",

    name: "com.android.server.flags.services-aconfig-java",

    aconfig_declarations: "com.android.server.flags.services-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

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

+5 −2
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; 
import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.am.MemoryStatUtil.hasMemcg;

import static com.android.server.am.ProcessList.ProcStartHandler;

import static com.android.server.flags.Flags.disableSystemCompaction;

import static com.android.server.net.NetworkPolicyManagerInternal.updateBlockedReasonsWithProcState;

import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;

import static com.android.server.pm.UserManagerInternal.USER_START_MODE_BACKGROUND;
@@ -8564,8 +8565,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
            final long now = SystemClock.uptimeMillis();

            final long timeSinceLastIdle = now - mLastIdleTime;













            if (!disableSystemCompaction()) {















                // Compact all non-zygote processes to freshen up the page cache.















                mOomAdjuster.mCachedAppOptimizer.compactAllSystem();













            }





























            final long lowRamSinceLastIdle = mAppProfiler.getLowRamTimeSinceIdleLPr(now);















            mLastIdleTime = now;

































services/core/java/com/android/server/flags/OWNERS



+2
−1




























Original line number
Diff line number
Diff line















per-file pinner.aconfig = edgararriaga@google.com













per-file compaction.aconfig = edgararriaga@google.com










 No newline at end of file
























services/core/java/com/android/server/flags/compaction.aconfig
0 → 100644



+8
−0




























Original line number
Diff line number
Diff line













package: "com.android.server.flags"



























flag {













    name: "disable_system_compaction"













    namespace: "system_performance"













    description: "This flag controls if all processes compaction should happen during idle maintenance."













    bug: "314328789"













}










 No newline at end of file