Improve device logcat logs for refresh & action timeouts.

This makes it easier to debug issues such as b/283707833

Bug: 283707833
Test: manual
Relnote: N/A
Change-Id: I1ac91c8c26b0c3fdf2811d50baa65caf0050a800

2 files changed, 27 insertions, 3 deletions

diff --git a/service/java/com/android/safetycenter/SafetyCenterRefreshTracker.java b/service/java/com/android/safetycenter/SafetyCenterRefreshTracker.java
index 2a0fa786b..080dfff68 100644
--- a/service/java/com/android/safetycenter/SafetyCenterRefreshTracker.java
+++ b/service/java/com/android/safetycenter/SafetyCenterRefreshTracker.java
@@ -78,7 +78,7 @@ public final class SafetyCenterRefreshTracker {
     String reportRefreshInProgress(
             @RefreshReason int refreshReason, UserProfileGroup userProfileGroup) {
         if (mRefreshInProgress != null) {
-            Log.i(TAG, "Replacing an ongoing refresh");
+            Log.i(TAG, "Replacing ongoing refresh with id: " + mRefreshInProgress.getId());
         }
 
         String refreshBroadcastId = UUID.randomUUID() + "_" + mRefreshCounter++;
@@ -272,6 +272,15 @@ public final class SafetyCenterRefreshTracker {
         int refreshReason = clearedRefresh.getReason();
         int requestType = RefreshReasons.toRefreshRequestType(refreshReason);
 
+        Log.w(
+                TAG,
+                "Timeout after "
+                        + clearedRefresh.getDurationSinceStart()
+                        + " for refresh with reason: "
+                        + refreshReason
+                        + ", and id: "
+                        + clearedRefresh.getId());
+
         for (int i = 0; i < timedOutSources.size(); i++) {
             SafetySourceKey sourceKey = timedOutSources.valueAt(i);
             Duration duration = clearedRefresh.getDurationSinceSourceStart(sourceKey);
@@ -285,6 +294,15 @@ public final class SafetyCenterRefreshTracker {
                         refreshReason,
                         false);
             }
+
+            Log.w(
+                    TAG,
+                    "Refresh with id: "
+                            + clearedRefresh.getId()
+                            + " timed out for tracked source id: "
+                            + sourceKey.getSourceId()
+                            + ", and user id: "
+                            + sourceKey.getUserId());
         }
 
         SafetyCenterStatsdLogger.writeWholeRefreshSystemEvent(
diff --git a/service/java/com/android/safetycenter/SafetyCenterService.java b/service/java/com/android/safetycenter/SafetyCenterService.java
index 1a9f60781..f70e58a20 100644
--- a/service/java/com/android/safetycenter/SafetyCenterService.java
+++ b/service/java/com/android/safetycenter/SafetyCenterService.java
@@ -906,8 +906,6 @@ public final class SafetyCenterService extends SystemService {
                                             "refresh_timeout")));
                 }
             }
-
-            Log.w(TAG, "Timeout for refresh with id: " + mRefreshBroadcastId);
         }
 
         @Override
@@ -956,6 +954,10 @@ public final class SafetyCenterService extends SystemService {
                         new SafetyCenterErrorDetails(
                                 mSafetyCenterResourcesContext.getStringByName(
                                         "resolving_action_error")));
+                Log.w(
+                        TAG,
+                        "Resolving action timed out for: "
+                                + toUserFriendlyString(mSafetyCenterIssueActionId));
             }
         }
 
@@ -1162,6 +1164,10 @@ public final class SafetyCenterService extends SystemService {
                 return;
             }
             if (safetySourceIssueAction.willResolve()) {
+                Log.d(
+                        TAG,
+                        "Starting resolving action for: "
+                                + toUserFriendlyString(safetyCenterIssueActionId));
                 mSafetyCenterDataManager.markSafetyCenterIssueActionInFlight(
                         safetyCenterIssueActionId);
                 ResolvingActionTimeout resolvingActionTimeout =