From 619a761ce81fcc51af36665804bfc6b71e392c4f Mon Sep 17 00:00:00 2001 From: Harshit Mahajan Date: Sun, 16 Feb 2025 16:05:13 +0000 Subject: Cleaning up recoverability_detection flag This flag has been released in 24Q3 and can be cleaned up. Following go/android-flags-guidelines#how-to-delete-a-flag Bug: 397017037 Test: TH Flag: EXEMPT cleaning flag Change-Id: Icfb659537eea62a85ab75d6bebb0068efe928b1c --- services/java/com/android/server/SystemServer.java | 36 ++++++---------------- 1 file changed, 9 insertions(+), 27 deletions(-) (limited to 'services/java') diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 2bbd69c65eb8..e158310455ac 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1279,12 +1279,6 @@ public final class SystemServer implements Dumpable { if (!Flags.refactorCrashrecovery()) { // Initialize RescueParty. CrashRecoveryAdaptor.rescuePartyRegisterHealthObserver(mSystemContext); - if (!Flags.recoverabilityDetection()) { - // Now that we have the bare essentials of the OS up and running, take - // note that we just booted, which might send out a rescue party if - // we're stuck in a runtime restart loop. - CrashRecoveryAdaptor.packageWatchdogNoteBoot(mSystemContext); - } } @@ -1558,14 +1552,6 @@ public final class SystemServer implements Dumpable { boolean enableVrService = context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE); - if (!Flags.recoverabilityDetection()) { - // For debugging RescueParty - if (Build.IS_DEBUGGABLE - && SystemProperties.getBoolean("debug.crash_system", false)) { - throw new RuntimeException(); - } - } - try { final String SECONDARY_ZYGOTE_PRELOAD = "SecondaryZygotePreload"; // We start the preload ~1s before the webview factory preparation, to @@ -3091,13 +3077,11 @@ public final class SystemServer implements Dumpable { CrashRecoveryAdaptor.initializeCrashrecoveryModuleService(mSystemServiceManager); t.traceEnd(); } else { - if (Flags.recoverabilityDetection()) { - // Now that we have the essential services needed for mitigations, register the boot - // with package watchdog. - // Note that we just booted, which might send out a rescue party if we're stuck in a - // runtime restart loop. - CrashRecoveryAdaptor.packageWatchdogNoteBoot(mSystemContext); - } + // Now that we have the essential services needed for mitigations, register the boot + // with package watchdog. + // Note that we just booted, which might send out a rescue party if we're stuck in a + // runtime restart loop. + CrashRecoveryAdaptor.packageWatchdogNoteBoot(mSystemContext); } t.traceBegin("MakeDisplayManagerServiceReady"); @@ -3511,12 +3495,10 @@ public final class SystemServer implements Dumpable { * are updated outside of OTA; and to avoid breaking dependencies from system into apexes. */ private void startApexServices(@NonNull TimingsTraceAndSlog t) { - if (Flags.recoverabilityDetection()) { - // For debugging RescueParty - if (Build.IS_DEBUGGABLE - && SystemProperties.getBoolean("debug.crash_system", false)) { - throw new RuntimeException(); - } + // For debugging RescueParty + if (Build.IS_DEBUGGABLE + && SystemProperties.getBoolean("debug.crash_system", false)) { + throw new RuntimeException(); } t.traceBegin("startApexServices"); -- cgit v1.2.3-59-g8ed1b