Merge "Merge "freezer: unfreeze upon creation of WPRI binding" into rvc-dev... (9a2f261a) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -2588,8 +2588,13 @@ public final class OomAdjuster {
		return;
		}

		// if an app is already frozen and shouldNotFreeze becomes true, immediately unfreeze
		if (app.frozen && app.shouldNotFreeze) {
		mCachedAppOptimizer.unfreezeAppLocked(app);
		}

		// Use current adjustment when freezing, set adjustment when unfreezing.
		if (app.curAdj >= ProcessList.CACHED_APP_MIN_ADJ && !app.frozen) {
		if (app.curAdj >= ProcessList.CACHED_APP_MIN_ADJ && !app.frozen && !app.shouldNotFreeze) {
		mCachedAppOptimizer.freezeAppAsync(app);
		} else if (app.setAdj < ProcessList.CACHED_APP_MIN_ADJ && app.frozen) {
		mCachedAppOptimizer.unfreezeAppLocked(app);