commit bc9caa1a2a38e23f7a6b61bcda81b5759e45ec66
author Jeff Sharkey <jsharkey@android.com> Sat Mar 11 20:38:21 2017 -0700
committer Jeff Sharkey <jsharkey@android.com> Sat Mar 11 20:38:24 2017 -0700
tree f348c35ebc2b335b20ac5e0d7515a49376f30900
parent bd5e5e0d75b6c1dbca0da2d40e96c18f94e07ac4

Switch RescueParty to PMS.logCriticalInfo().

When RescueParty is triggered, we could end up in recovery before a
bugreport can be taken.  To help understand why RescueParty was
triggered after the fact, this change switches a handful of critical
log messages to use PMS.logCriticalInfo().

These logs then go into our persistent log on disk, which is also
included in all future bugreports.

Bug: 35805331, 36033178
Test: builds, boots, forced crashing recorded in persistent log
Change-Id: Ic71206b25c4b0b703e464ff1d07c5e0b31549257

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

diff --git a/services/core/java/com/android/server/RescueParty.java b/services/core/java/com/android/server/RescueParty.java
index 480b08a..cecd7e5 100644
--- a/services/core/java/com/android/server/RescueParty.java
+++ b/services/core/java/com/android/server/RescueParty.java
@@ -29,11 +29,13 @@
 import android.provider.Settings;
 import android.text.format.DateUtils;
 import android.util.ExceptionUtils;
+import android.util.Log;
 import android.util.MathUtils;
 import android.util.Slog;
 import android.util.SparseArray;
 
 import com.android.internal.util.ArrayUtils;
+import com.android.server.pm.PackageManagerService;
 
 import java.io.File;
 
@@ -49,6 +51,7 @@
 public class RescueParty {
     private static final String TAG = "RescueParty";
 
+    private static final String PROP_ENABLE_RESCUE = "persist.sys.enable_rescue";
     private static final String PROP_DISABLE_RESCUE = "persist.sys.disable_rescue";
     private static final String PROP_RESCUE_LEVEL = "sys.rescue_level";
     private static final String PROP_RESCUE_BOOT_COUNT = "sys.rescue_boot_count";
@@ -66,6 +69,11 @@
     private static SparseArray<Threshold> sApps = new SparseArray<>();
 
     private static boolean isDisabled() {
+        // Check if we're explicitly enabled for testing
+        if (SystemProperties.getBoolean(PROP_ENABLE_RESCUE, true)) {
+            return false;
+        }
+
         // We're disabled on all engineering devices
         if (Build.IS_ENG) {
             Slog.v(TAG, "Disabled because of eng build");
@@ -138,7 +146,8 @@
         SystemProperties.set(PROP_RESCUE_LEVEL, Integer.toString(level));
 
         EventLogTags.writeRescueLevel(level, triggerUid);
-        Slog.w(TAG, "Incremented rescue level to " + levelToString(level));
+        PackageManagerService.logCriticalInfo(Log.WARN, "Incremented rescue level to "
+                + levelToString(level) + " triggered by UID " + triggerUid);
     }
 
     /**
@@ -157,10 +166,13 @@
         try {
             executeRescueLevelInternal(context, level);
             EventLogTags.writeRescueSuccess(level);
-            Slog.d(TAG, "Finished rescue level " + levelToString(level));
+            PackageManagerService.logCriticalInfo(Log.DEBUG,
+                    "Finished rescue level " + levelToString(level));
         } catch (Throwable t) {
-            EventLogTags.writeRescueFailure(level, ExceptionUtils.getCompleteMessage(t));
-            Slog.e(TAG, "Failed rescue level " + levelToString(level), t);
+            final String msg = ExceptionUtils.getCompleteMessage(t);
+            EventLogTags.writeRescueFailure(level, msg);
+            PackageManagerService.logCriticalInfo(Log.ERROR,
+                    "Failed rescue level " + levelToString(level) + ": " + msg);
         }
     }