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

Commit ebd1d816 authored by Liana Kazanova's avatar Liana Kazanova Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add throtling to crashloop mitigations"" into main am: 108ffe3b 

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



Change-Id: I62897986a725df52140895908b4c012ffc692cf3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27afbacf 108ffe3b

services/core/java/com/android/server/PackageWatchdog.java

+0 −23
Original line number Diff line number Diff line
@@ -138,11 +138,6 @@ public class PackageWatchdog { 


    static final long DEFAULT_BOOT_LOOP_TRIGGER_WINDOW_MS = TimeUnit.MINUTES.toMillis(10);



    // Time needed to apply mitigation

    private static final String MITIGATION_WINDOW_MS =

            "persist.device_config.configuration.mitigation_window_ms";

    private static final long DEFAULT_MITIGATION_WINDOW_MS = TimeUnit.SECONDS.toMillis(5);



    // Threshold level at which or above user might experience significant disruption.

    private static final String MAJOR_USER_IMPACT_LEVEL_THRESHOLD =

            "persist.device_config.configuration.major_user_impact_level_threshold";
@@ -215,9 +210,6 @@ public class PackageWatchdog { 
    @GuardedBy("mLock")

    private boolean mSyncRequired = false;



    @GuardedBy("mLock")

    private long mLastMitigation = -1000000;



    @FunctionalInterface

    @VisibleForTesting

    interface SystemClock {
@@ -408,14 +400,6 @@ public class PackageWatchdog { 
            Slog.w(TAG, "Could not resolve a list of failing packages");

            return;

        }

        synchronized (mLock) {

            final long now = mSystemClock.uptimeMillis();

            if (now >= mLastMitigation

                    && (now - mLastMitigation) < getMitigationWindowMs()) {

                Slog.i(TAG, "Skipping onPackageFailure mitigation");

                return;

            }

        }

        mLongTaskHandler.post(() -> {

            synchronized (mLock) {

                if (mAllObservers.isEmpty()) {
@@ -516,17 +500,10 @@ public class PackageWatchdog { 
                              int currentObserverImpact,

                              int mitigationCount) {

        if (currentObserverImpact < getUserImpactLevelLimit()) {

            synchronized (mLock) {

                mLastMitigation = mSystemClock.uptimeMillis();

            }

            currentObserverToNotify.execute(versionedPackage, failureReason, mitigationCount);

        }

    }



    private long getMitigationWindowMs() {

        return SystemProperties.getLong(MITIGATION_WINDOW_MS, DEFAULT_MITIGATION_WINDOW_MS);

    }





    /**

     * Called when the system server boots. If the system server is detected to be in a boot loop,