Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbf289fc authored by Li Li's avatar Li Li Committed by Automerger Merge Worker
Browse files

Merge "Move Freezer flags to _boot namespace" into sc-dev am: 77e41c68 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15070511

Change-Id: I603966e7c53aa9419d78bce0fca4aee7c22b0a89
parents 311d25c7 77e41c68

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) {