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

Commit 78d3bbf6 authored by Harshit Mahajan's avatar Harshit Mahajan
Browse files

Use isRecoveryTriggeredReboot from platform 

RescueParty#isRecoveryTriggeredReboot is being moved to module. This would make it a hidden api. Migrate to isRecoveryTriggeredReboot API from CrashRecoveryHelper.

Bug: 338468233
Change-Id: Ide9f5e7a5827f3224b9b7c61e860e12c0aa66b18
Test: TH
Flag: EXEMPT refactor
parent 176c12e0

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

+2 −2
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ import com.android.internal.util.DumpUtils; 
import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.LatencyTracker;

import com.android.internal.util.Preconditions;

import com.android.server.crashrecovery.CrashRecoveryHelper;

import com.android.server.EventLogTags;

import com.android.server.LockGuard;

import com.android.server.RescueParty;

import com.android.server.ServiceThread;

import com.android.server.SystemService;

import com.android.server.UiThread;
@@ -4031,7 +4031,7 @@ public final class PowerManagerService extends SystemService 
            }

        }

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

            if (RescueParty.isRecoveryTriggeredReboot()) {

            if (CrashRecoveryHelper.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,8 +59,8 @@ import android.view.SurfaceControl; 
import android.view.WindowManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.server.crashrecovery.CrashRecoveryHelper;

import com.android.server.LocalServices;

import com.android.server.RescueParty;

import com.android.server.statusbar.StatusBarManagerInternal;



import java.io.File;
@@ -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 (RescueParty.isRecoveryTriggeredReboot()) {

            if (CrashRecoveryHelper.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.