Merge "Move Freezer flags to _boot namespace" into sc-dev (77e41c68) · Commits · e / os / android_frameworks_base

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -203,8 +203,6 @@ public final class CachedAppOptimizer {
		updateMinOomAdjThrottle();
		} else if (KEY_COMPACT_THROTTLE_MAX_OOM_ADJ.equals(name)) {
		updateMaxOomAdjThrottle();
		} else if (KEY_FREEZER_DEBOUNCE_TIMEOUT.equals(name)) {
		updateFreezerDebounceTimeout();
		}
		}
		}
		@@ -344,7 +342,6 @@ public final class CachedAppOptimizer {
		updateUseFreezer();
		updateMinOomAdjThrottle();
		updateMaxOomAdjThrottle();
		updateFreezerDebounceTimeout();
		}
		}

		@@ -656,6 +653,7 @@ public final class CachedAppOptimizer {
		\|\| DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT,
		KEY_USE_FREEZER, DEFAULT_USE_FREEZER)) {
		mUseFreezer = isFreezerSupported();
		updateFreezerDebounceTimeout();
		}

		final boolean useFreezer = mUseFreezer;
		@@ -834,7 +832,8 @@ public final class CachedAppOptimizer {

		@GuardedBy("mPhenotypeFlagLock")
		private void updateFreezerDebounceTimeout() {
		mFreezerDebounceTimeout = DeviceConfig.getLong(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
		mFreezerDebounceTimeout = DeviceConfig.getLong(
		DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT,
		KEY_FREEZER_DEBOUNCE_TIMEOUT, DEFAULT_FREEZER_DEBOUNCE_TIMEOUT);

		if (mFreezerDebounceTimeout < 0) {