commit acd97414784ec9612a3a2ec017204ca4c3361381
author Adam Bookatz <bookatz@google.com> Tue Feb 01 17:12:01 2022 -0800
committer Adam Bookatz <bookatz@google.com> Wed Feb 02 09:50:01 2022 -0800
tree 547ec8aa4643a5979819ee5bb7e525a9509b61b8
parent 79d91e3efa240f02de99036d100935c839c72615

Make SSM failure logging more consistent

The purpose of this is to help ensure the failure log will be consistent
if a system service fails. This can be used in parsing logcat for tests
(which isn't a great way to test, but it'll do for now).

Test: atest CreateUsersNoAppCrashesTest
Bug: 217246676
Change-Id: I422a380e1da63c4f42687212ac19171819f37ae2

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

diff --git a/services/core/java/com/android/server/SystemServiceManager.java b/services/core/java/com/android/server/SystemServiceManager.java
index ce30f03..d719d77 100644
--- a/services/core/java/com/android/server/SystemServiceManager.java
+++ b/services/core/java/com/android/server/SystemServiceManager.java
@@ -509,8 +509,7 @@
                         throw new IllegalArgumentException(onWhat + " what?");
                 }
             } catch (Exception ex) {
-                Slog.wtf(TAG, "Failure reporting " + onWhat + " of user " + curUser
-                        + " to service " + serviceName, ex);
+                logFailure(onWhat, curUser, serviceName, ex);
             }
             if (!submitToThreadPool) {
                 warnIfTooLong(SystemClock.elapsedRealtime() - time, service,
@@ -584,8 +583,7 @@
                 warnIfTooLong(SystemClock.elapsedRealtime() - time, service,
                         "on" + USER_STARTING + "User-" + curUserId);
             } catch (Exception e) {
-                Slog.wtf(TAG, "Failure reporting " + USER_STARTING + " of user " + curUser
-                        + " to service " + serviceName, e);
+                logFailure(USER_STARTING, curUser, serviceName, e);
                 Slog.e(TAG, "Disabling thread pool - please capture a bug report.");
                 sUseLifecycleThreadPool = false;
             } finally {
@@ -608,8 +606,7 @@
                 warnIfTooLong(SystemClock.elapsedRealtime() - time, service,
                         "on" + USER_COMPLETED_EVENT + "User-" + curUserId);
             } catch (Exception e) {
-                Slog.wtf(TAG, "Failure reporting " + USER_COMPLETED_EVENT + " of user " + curUser
-                        + " to service " + serviceName, e);
+                logFailure(USER_COMPLETED_EVENT, curUser, serviceName, e);
                 throw e;
             } finally {
                 t.traceEnd();
@@ -617,6 +614,12 @@
         };
     }
 
+    /** Logs the failure. That's all. Tests may rely on parsing it, so only modify carefully. */
+    private void logFailure(String onWhat, TargetUser curUser, String serviceName, Exception ex) {
+        Slog.wtf(TAG, "SystemService failure: Failure reporting " + onWhat + " of user "
+                + curUser + " to service " + serviceName, ex);
+    }
+
     /** Sets the safe mode flag for services to query. */
     void setSafeMode(boolean safeMode) {
         mSafeMode = safeMode;