From e1627f5362f7239a0e920876621300c564e35cbf Mon Sep 17 00:00:00 2001 From: Thirupathi Reddy R Date: Wed, 29 Jun 2022 09:11:48 +0530 Subject: Fixing code diff Change-Id: Ib1aee44ed6028dc16aa212e140dd510ee7f115eb --- .../core/java/com/android/server/am/ActivityManagerService.java | 1 - services/core/java/com/android/server/am/CachedAppOptimizer.java | 9 --------- services/core/java/com/android/server/am/OomAdjuster.java | 4 ---- 3 files changed, 14 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index dbdb2ab54e89..3e3a4a51f372 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -6447,7 +6447,6 @@ public class ActivityManagerService extends IActivityManager.Stub reportCurWakefulnessUsageEvent(); mActivityTaskManager.onScreenAwakeChanged(isAwake); mOomAdjProfiler.onWakefulnessChanged(wakefulness); - mOomAdjuster.onWakefulnessChanged(wakefulness); } updateOomAdjLocked(OomAdjuster.OOM_ADJ_REASON_UI_VISIBILITY); } diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java index 30b63940de7f..2aba375fc40b 100644 --- a/services/core/java/com/android/server/am/CachedAppOptimizer.java +++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java @@ -1128,15 +1128,6 @@ public final class CachedAppOptimizer { } } - void onWakefulnessChanged(int wakefulness) { - if(wakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE) { - // Remove any pending compaction we may have scheduled to happen while screen was off - Slog.e(TAG_AM, "Cancel pending or running compactions as system is awake"); - mPendingCompactionProcesses.clear(); - cancelCompaction(); - } - } - @GuardedBy({"mService", "mProcLock"}) void onOomAdjustChanged(int oldAdj, int newAdj, ProcessRecord app) { // Cancel any currently executing compactions diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index 2ed6fc483e31..e94c2fa60fc1 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -2687,10 +2687,6 @@ public class OomAdjuster { } } - void onWakefulnessChanged(int wakefulness) { - mCachedAppOptimizer.onWakefulnessChanged(wakefulness); - } - /** Applies the computed oomadj, procstate and sched group values and freezes them in set* */ @GuardedBy({"mService", "mProcLock"}) private boolean applyOomAdjLSP(ProcessRecord app, boolean doingAll, long now, -- cgit v1.2.3