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

Commit ec7f7207 authored by Priyanka Advani's avatar Priyanka Advani Committed by Gerrit Code Review
Browse files

Revert "Add throtling to crashloop mitigations" 

This reverts commit 831334bd.

Reason for revert: Droidmonitor triggered revert due to b/341375758.

Change-Id: I9aaf3e0bca1d173ea7f449339185db5ace780626
parent 831334bd

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,