Rename SafetyCenterDataTracker to SafetyCenterDataFactory

This class only has two public methods now:

* getSafetyCenterData
* getDefaultSafetyCenterData (static)

The rest of the methods and/or their implementations have moved to
SafetyCenterRepository and SafetyCenterPullAtomCallback.

Fix: 250812300
Test: n/a just renaming
Change-Id: Ice26bac34b0d854c01326fdb05792dd0b01b3e6a

4 files changed, 21 insertions, 23 deletions

diff --git a/service/java/com/android/safetycenter/SafetyCenterDataTracker.java b/service/java/com/android/safetycenter/SafetyCenterDataFactory.java
index 2e19c4e78..281c267b7 100644
--- a/service/java/com/android/safetycenter/SafetyCenterDataTracker.java
+++ b/service/java/com/android/safetycenter/SafetyCenterDataFactory.java
@@ -63,18 +63,16 @@ import java.util.Locale;
 import javax.annotation.concurrent.NotThreadSafe;
 
 /**
- * Aggregates {@link SafetySourceData} into a {@link SafetyCenterData} object to be used by Safety
- * Center listeners including PermissionController.
+ * Aggregates {@link SafetySourceData} to build {@link SafetyCenterData} instances which are shared
+ * with Safety Center listeners, including PermissionController.
  *
  * <p>This class isn't thread safe. Thread safety must be handled by the caller.
  */
-// TODO(b/250812300): Change the name of this class to reflect the "aggregating them into
-//   SafetyCenterData object" responsibility only.
 @RequiresApi(TIRAMISU)
 @NotThreadSafe
-final class SafetyCenterDataTracker {
+final class SafetyCenterDataFactory {
 
-    private static final String TAG = "SafetyCenterDataTracker";
+    private static final String TAG = "SafetyCenterDataFactory";
 
     private static final String ANDROID_LOCK_SCREEN_SOURCES_GROUP_ID = "AndroidLockScreenSources";
 
@@ -89,7 +87,7 @@ final class SafetyCenterDataTracker {
     @NonNull private final SafetyCenterIssueCache mSafetyCenterIssueCache;
     @NonNull private final SafetyCenterRepository mSafetyCenterRepository;
 
-    SafetyCenterDataTracker(
+    SafetyCenterDataFactory(
             @NonNull SafetyCenterResourcesContext safetyCenterResourcesContext,
             @NonNull SafetyCenterConfigReader safetyCenterConfigReader,
             @NonNull SafetyCenterRefreshTracker safetyCenterRefreshTracker,
diff --git a/service/java/com/android/safetycenter/SafetyCenterListeners.java b/service/java/com/android/safetycenter/SafetyCenterListeners.java
index 934155ae7..f7abdc137 100644
--- a/service/java/com/android/safetycenter/SafetyCenterListeners.java
+++ b/service/java/com/android/safetycenter/SafetyCenterListeners.java
@@ -51,13 +51,13 @@ final class SafetyCenterListeners {
 
     private static final String TAG = "SafetyCenterListeners";
 
-    @NonNull private final SafetyCenterDataTracker mSafetyCenterDataTracker;
+    @NonNull private final SafetyCenterDataFactory mSafetyCenterDataFactory;
 
     private final SparseArray<RemoteCallbackList<IOnSafetyCenterDataChangedListener>>
             mSafetyCenterDataChangedListeners = new SparseArray<>();
 
-    SafetyCenterListeners(@NonNull SafetyCenterDataTracker safetyCenterDataTracker) {
-        mSafetyCenterDataTracker = safetyCenterDataTracker;
+    SafetyCenterListeners(@NonNull SafetyCenterDataFactory safetyCenterDataFactory) {
+        mSafetyCenterDataFactory = safetyCenterDataFactory;
     }
 
     /**
@@ -229,7 +229,7 @@ final class SafetyCenterListeners {
                     safetyCenterData = cachedSafetyCenterData;
                 } else {
                     safetyCenterData =
-                            mSafetyCenterDataTracker.getSafetyCenterData(
+                            mSafetyCenterDataFactory.getSafetyCenterData(
                                     packageName, userProfileGroup);
                     safetyCenterDataCache.put(packageName, safetyCenterData);
                 }
diff --git a/service/java/com/android/safetycenter/SafetyCenterPullAtomCallback.java b/service/java/com/android/safetycenter/SafetyCenterPullAtomCallback.java
index 02ba90015..c970b5607 100644
--- a/service/java/com/android/safetycenter/SafetyCenterPullAtomCallback.java
+++ b/service/java/com/android/safetycenter/SafetyCenterPullAtomCallback.java
@@ -74,7 +74,7 @@ final class SafetyCenterPullAtomCallback implements StatsPullAtomCallback {
 
     @GuardedBy("mApiLock")
     @NonNull
-    private final SafetyCenterDataTracker mSafetyCenterDataTracker;
+    private final SafetyCenterDataFactory mSafetyCenterDataFactory;
 
     @GuardedBy("mApiLock")
     @NonNull
@@ -86,14 +86,14 @@ final class SafetyCenterPullAtomCallback implements StatsPullAtomCallback {
             @NonNull StatsdLogger statsdLogger,
             @NonNull SafetyCenterConfigReader safetyCenterConfigReader,
             @NonNull SafetyCenterRepository safetyCenterRepository,
-            @NonNull SafetyCenterDataTracker safetyCenterDataTracker,
+            @NonNull SafetyCenterDataFactory safetyCenterDataFactory,
             @NonNull SafetyCenterIssueCache safetyCenterIssueCache) {
         mContext = context;
         mApiLock = apiLock;
         mStatsdLogger = statsdLogger;
         mSafetyCenterConfigReader = safetyCenterConfigReader;
         mSafetyCenterRepository = safetyCenterRepository;
-        mSafetyCenterDataTracker = safetyCenterDataTracker;
+        mSafetyCenterDataFactory = safetyCenterDataFactory;
         mSafetyCenterIssueCache = safetyCenterIssueCache;
     }
 
@@ -134,7 +134,7 @@ final class SafetyCenterPullAtomCallback implements StatsPullAtomCallback {
         // TODO: We could make SafetyCenterPullAtomCallback a SafetyCenterListener and hold a
         //  reference to the last SafetyCenterData so we don't need to recalculate that here.
         SafetyCenterData safetyCenterData =
-                mSafetyCenterDataTracker.getSafetyCenterData("android", userProfileGroup);
+                mSafetyCenterDataFactory.getSafetyCenterData("android", userProfileGroup);
         long openIssuesCount = safetyCenterData.getIssues().size();
         long dismissedIssuesCount =
                 mSafetyCenterIssueCache.countActiveIssues(userProfileGroup) - openIssuesCount;
diff --git a/service/java/com/android/safetycenter/SafetyCenterService.java b/service/java/com/android/safetycenter/SafetyCenterService.java
index 3cca78270..5c9e17827 100644
--- a/service/java/com/android/safetycenter/SafetyCenterService.java
+++ b/service/java/com/android/safetycenter/SafetyCenterService.java
@@ -145,7 +145,7 @@ public final class SafetyCenterService extends SystemService {
 
     @GuardedBy("mApiLock")
     @NonNull
-    private final SafetyCenterDataTracker mSafetyCenterDataTracker;
+    private final SafetyCenterDataFactory mSafetyCenterDataFactory;
 
     @GuardedBy("mApiLock")
     @NonNull
@@ -183,15 +183,15 @@ public final class SafetyCenterService extends SystemService {
                         mSafetyCenterRefreshTracker,
                         statsdLogger,
                         mSafetyCenterIssueCache);
-        mSafetyCenterDataTracker =
-                new SafetyCenterDataTracker(
+        mSafetyCenterDataFactory =
+                new SafetyCenterDataFactory(
                         mSafetyCenterResourcesContext,
                         mSafetyCenterConfigReader,
                         mSafetyCenterRefreshTracker,
                         new PendingIntentFactory(context),
                         mSafetyCenterIssueCache,
                         mSafetyCenterRepository);
-        mSafetyCenterListeners = new SafetyCenterListeners(mSafetyCenterDataTracker);
+        mSafetyCenterListeners = new SafetyCenterListeners(mSafetyCenterDataFactory);
         mSafetyCenterBroadcastDispatcher =
                 new SafetyCenterBroadcastDispatcher(
                         context, mSafetyCenterConfigReader, mSafetyCenterRefreshTracker);
@@ -202,7 +202,7 @@ public final class SafetyCenterService extends SystemService {
                         statsdLogger,
                         mSafetyCenterConfigReader,
                         mSafetyCenterRepository,
-                        mSafetyCenterDataTracker,
+                        mSafetyCenterDataFactory,
                         mSafetyCenterIssueCache);
         mAppOpsManager = requireNonNull(context.getSystemService(AppOpsManager.class));
         mDeviceSupportsSafetyCenter =
@@ -390,13 +390,13 @@ public final class SafetyCenterService extends SystemService {
             mAppOpsManager.checkPackage(Binder.getCallingUid(), packageName);
             if (!enforceCrossUserPermission("getSafetyCenterData", userId)
                     || !checkApiEnabled("getSafetyCenterData")) {
-                return SafetyCenterDataTracker.getDefaultSafetyCenterData();
+                return SafetyCenterDataFactory.getDefaultSafetyCenterData();
             }
 
             UserProfileGroup userProfileGroup = UserProfileGroup.from(getContext(), userId);
 
             synchronized (mApiLock) {
-                return mSafetyCenterDataTracker.getSafetyCenterData(packageName, userProfileGroup);
+                return mSafetyCenterDataFactory.getSafetyCenterData(packageName, userProfileGroup);
             }
         }
 
@@ -425,7 +425,7 @@ public final class SafetyCenterService extends SystemService {
                 }
                 SafetyCenterListeners.deliverUpdateForListener(
                         listener,
-                        mSafetyCenterDataTracker.getSafetyCenterData(packageName, userProfileGroup),
+                        mSafetyCenterDataFactory.getSafetyCenterData(packageName, userProfileGroup),
                         null);
             }
         }