diff options
4 files changed, 21 insertions, 1 deletions
diff --git a/services/core/Android.bp b/services/core/Android.bp index d9c269410b93..6521fabe5b7c 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -194,6 +194,7 @@ java_library_static { "notification_flags_lib", "camera_platform_flags_core_java_lib", "biometrics_flags_lib", + "am_flags_lib", ], javac_shard_size: 50, javacflags: [ diff --git a/services/core/java/com/android/server/am/ActivityManagerConstants.java b/services/core/java/com/android/server/am/ActivityManagerConstants.java index c20f0aa4a62a..9716cf69015c 100644 --- a/services/core/java/com/android/server/am/ActivityManagerConstants.java +++ b/services/core/java/com/android/server/am/ActivityManagerConstants.java @@ -225,7 +225,7 @@ final class ActivityManagerConstants extends ContentObserver { /** * The default value to {@link #KEY_ENABLE_NEW_OOMADJ}. */ - private static final boolean DEFAULT_ENABLE_NEW_OOM_ADJ = false; + private static final boolean DEFAULT_ENABLE_NEW_OOM_ADJ = Flags.oomadjusterCorrectnessRewrite(); /** * Same as {@link TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_NOT_ALLOWED} diff --git a/services/core/java/com/android/server/am/Android.bp b/services/core/java/com/android/server/am/Android.bp new file mode 100644 index 000000000000..af1200e4bdf8 --- /dev/null +++ b/services/core/java/com/android/server/am/Android.bp @@ -0,0 +1,10 @@ +aconfig_declarations { + name: "am_flags", + package: "com.android.server.am", + srcs: ["*.aconfig"], +} + +java_aconfig_library { + name: "am_flags_lib", + aconfig_declarations: "am_flags", +} diff --git a/services/core/java/com/android/server/am/flags.aconfig b/services/core/java/com/android/server/am/flags.aconfig new file mode 100644 index 000000000000..b03cc6295b8d --- /dev/null +++ b/services/core/java/com/android/server/am/flags.aconfig @@ -0,0 +1,9 @@ +package: "com.android.server.am" + +flag { + name: "oomadjuster_correctness_rewrite" + namespace: "android_platform_power_optimization" + description: "Utilize new OomAdjuster implementation" + bug: "298055811" + is_fixed_read_only: true +}
\ No newline at end of file |