Merge "Move Freezer flags to _boot namespace" into sc-dev

This commit is contained in:
Li Li
2021-06-23 16:12:46 +00:00
committed by Android (Google) Code Review

View File

@@ -203,8 +203,6 @@ public final class CachedAppOptimizer {
updateMinOomAdjThrottle(); updateMinOomAdjThrottle();
} else if (KEY_COMPACT_THROTTLE_MAX_OOM_ADJ.equals(name)) { } else if (KEY_COMPACT_THROTTLE_MAX_OOM_ADJ.equals(name)) {
updateMaxOomAdjThrottle(); updateMaxOomAdjThrottle();
} else if (KEY_FREEZER_DEBOUNCE_TIMEOUT.equals(name)) {
updateFreezerDebounceTimeout();
} }
} }
} }
@@ -344,7 +342,6 @@ public final class CachedAppOptimizer {
updateUseFreezer(); updateUseFreezer();
updateMinOomAdjThrottle(); updateMinOomAdjThrottle();
updateMaxOomAdjThrottle(); updateMaxOomAdjThrottle();
updateFreezerDebounceTimeout();
} }
} }
@@ -656,6 +653,7 @@ public final class CachedAppOptimizer {
|| DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT, || DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT,
KEY_USE_FREEZER, DEFAULT_USE_FREEZER)) { KEY_USE_FREEZER, DEFAULT_USE_FREEZER)) {
mUseFreezer = isFreezerSupported(); mUseFreezer = isFreezerSupported();
updateFreezerDebounceTimeout();
} }
final boolean useFreezer = mUseFreezer; final boolean useFreezer = mUseFreezer;
@@ -834,7 +832,8 @@ public final class CachedAppOptimizer {
@GuardedBy("mPhenotypeFlagLock") @GuardedBy("mPhenotypeFlagLock")
private void updateFreezerDebounceTimeout() { 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); KEY_FREEZER_DEBOUNCE_TIMEOUT, DEFAULT_FREEZER_DEBOUNCE_TIMEOUT);
if (mFreezerDebounceTimeout < 0) { if (mFreezerDebounceTimeout < 0) {