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

Commit 876f1670 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use PackageWatchdog SystemApi instead of CrashRecoveryHelper" into main

parents 8c959e5e 824e45fe

services/core/java/com/android/server/power/PowerManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -130,12 +130,12 @@ import com.android.internal.util.LatencyTracker; 
import com.android.internal.util.Preconditions;

import com.android.server.EventLogTags;

import com.android.server.LockGuard;

import com.android.server.PackageWatchdog;

import com.android.server.ServiceThread;

import com.android.server.SystemService;

import com.android.server.UiThread;

import com.android.server.Watchdog;

import com.android.server.am.BatteryStatsService;

import com.android.server.crashrecovery.CrashRecoveryHelper;

import com.android.server.display.feature.DeviceConfigParameterProvider;

import com.android.server.lights.LightsManager;

import com.android.server.lights.LogicalLight;
@@ -4113,7 +4113,7 @@ public final class PowerManagerService extends SystemService 
            }

        }

        if (mHandler == null || !mSystemReady) {

            if (CrashRecoveryHelper.isRecoveryTriggeredReboot()) {

            if (PackageWatchdog.isRecoveryTriggeredReboot()) {

                // If we're stuck in a really low-level reboot loop, and a

                // rescue party is trying to prompt the user for a factory data

                // reset, we must GET TO DA CHOPPA!

services/core/java/com/android/server/power/ShutdownThread.java

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ import android.view.SurfaceControl; 
import android.view.WindowManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.server.crashrecovery.CrashRecoveryHelper;

import com.android.server.PackageWatchdog;

import com.android.server.LocalServices;

import com.android.server.statusbar.StatusBarManagerInternal;
@@ -339,7 +339,7 @@ public final class ShutdownThread extends Thread { 
                            com.android.internal.R.string.reboot_to_update_reboot));

            }

        } else if (mReason != null && mReason.equals(PowerManager.REBOOT_RECOVERY)) {

            if (CrashRecoveryHelper.isRecoveryTriggeredReboot()) {

            if (PackageWatchdog.isRecoveryTriggeredReboot()) {

                // We're not actually doing a factory reset yet; we're rebooting

                // to ask the user if they'd like to reset, so give them a less

                // scary dialog message.