Merge "Avoid trying to cancel compactions when compaction is disabled" (7e78ac83) · Commits · e / os / android_frameworks_base

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

+10 −3

Original line number	Diff line number	Diff line
		@@ -1537,15 +1537,22 @@ 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");
		if (useCompaction()) {
		// Remove any pending compaction we may have scheduled to happen while screen was
		// off
		cancelAllCompactions(CancelCompactReason.SCREEN_ON);
		}
		}
		}

		void cancelAllCompactions(CancelCompactReason reason) {
		synchronized (mProcLock) {
		while(!mPendingCompactionProcesses.isEmpty()) {
		if (DEBUG_COMPACTION) {
		Slog.e(TAG_AM,
		"Cancel pending compaction as system is awake for process="
		+ mPendingCompactionProcesses.get(0).processName);
		}
		cancelCompactionForProcess(mPendingCompactionProcesses.get(0), reason);
		}
		mPendingCompactionProcesses.clear();