summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/am/OomAdjuster.java18
1 files changed, 17 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index 804de920a3d9..363ba82cb332 100644
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -4107,6 +4107,7 @@ public class OomAdjuster {
return;
}
+ final boolean freezePolicy = getFreezePolicy(app);
final ProcessCachedOptimizerRecord opt = app.mOptRecord;
final ProcessStateRecord state = app.mState;
if (Flags.traceUpdateAppFreezeStateLsp()) {
@@ -4123,6 +4124,21 @@ public class OomAdjuster {
if ((oomAdjChanged || shouldNotFreezeChanged || cpuCapabilityChanged)
&& Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
Trace.instantForTrack(Trace.TRACE_TAG_ACTIVITY_MANAGER,
+ "FreezeLite",
+ (opt.isFrozen() ? "F" : "-")
+ + (opt.isPendingFreeze() ? "P" : "-")
+ + (opt.isFreezeExempt() ? "E" : "-")
+ + (opt.shouldNotFreeze() ? "N" : "-")
+ + (hasCpuCapability ? "T" : "-")
+ + (immediate ? "I" : "-")
+ + (freezePolicy ? "Z" : "-")
+ + (Flags.useCpuTimeCapability() ? "t" : "-")
+ + (Flags.prototypeAggressiveFreezing() ? "a" : "-")
+ + "/" + app.getPid()
+ + "/" + state.getCurAdj()
+ + "/" + oldOomAdj
+ + "/" + opt.shouldNotFreezeReason());
+ Trace.instantForTrack(Trace.TRACE_TAG_ACTIVITY_MANAGER,
CachedAppOptimizer.ATRACE_FREEZER_TRACK,
"updateAppFreezeStateLSP " + app.processName
+ " pid: " + app.getPid()
@@ -4137,7 +4153,7 @@ public class OomAdjuster {
}
}
- if (getFreezePolicy(app)) {
+ if (freezePolicy) {
// This process should be frozen.
if (immediate && !opt.isFrozen()) {
// And it will be frozen immediately.