diff options
author | 2024-04-01 20:35:13 +0000 | |
---|---|---|
committer | 2024-04-01 20:35:13 +0000 | |
commit | eab7a6d5a59cf2a6cc7ae6bd018093b27c25ec4a (patch) | |
tree | 419358e76f74f4ca5135826f1fa6d1f056da9a43 | |
parent | 5a0d9d7a6f5666c5beaffaa5957734fb66a4d657 (diff) | |
parent | a66bca9b494a909e7936f42044499ab2789060bb (diff) |
Merge "Ensure account info logged doesn't expose user data." into main
-rw-r--r-- | services/core/java/com/android/server/content/SyncStorageEngine.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/content/SyncStorageEngine.java b/services/core/java/com/android/server/content/SyncStorageEngine.java index 333f62a81e94..3ad6a4ae59f0 100644 --- a/services/core/java/com/android/server/content/SyncStorageEngine.java +++ b/services/core/java/com/android/server/content/SyncStorageEngine.java @@ -347,6 +347,11 @@ public class SyncStorageEngine { return target + ", enabled=" + enabled + ", syncable=" + syncable + ", backoff=" + backoffTime + ", delay=" + delayUntil; } + + public String toSafeString() { + return target.toSafeString() + ", enabled=" + enabled + ", syncable=" + syncable + + ", backoff=" + backoffTime + ", delay=" + delayUntil; + } } public static class SyncHistoryItem { @@ -553,7 +558,7 @@ public class SyncStorageEngine { final int size = mAuthorities.size(); mLogger.log("Loaded ", size, " items"); for (int i = 0; i < size; i++) { - mLogger.log(mAuthorities.valueAt(i)); + mLogger.log(mAuthorities.valueAt(i).toSafeString()); } } } @@ -734,7 +739,7 @@ public class SyncStorageEngine { Slog.d(TAG, "setSyncAutomatically: " + /* account + */" provider " + providerName + ", user " + userId + " -> " + sync); } - mLogger.log("Set sync auto account=", account, + mLogger.log("Set sync auto account=", account.toSafeString(), " user=", userId, " authority=", providerName, " value=", Boolean.toString(sync), @@ -812,7 +817,8 @@ public class SyncStorageEngine { private void setSyncableStateForEndPoint(EndPoint target, int syncable, int callingUid, int callingPid) { AuthorityInfo aInfo; - mLogger.log("Set syncable ", target, " value=", Integer.toString(syncable), + mLogger.log("Set syncable ", target.toSafeString(), + " value=", Integer.toString(syncable), " cuid=", callingUid, " cpid=", callingPid); synchronized (mAuthorities) { |