From 2722d365c9b93adc88c14e55aaf6ffb54d47cda5 Mon Sep 17 00:00:00 2001 From: beatricemarch Date: Fri, 4 Aug 2023 15:11:30 +0000 Subject: Rename BackupManagerMonitorUtil to BackupManagerMonitorEventSender and convert it into an instance class in preparation of adding more complex behaviour for recording BMM events to dumpsys. Bug: 290746120 Test: atest BackupManagerMonitorEventSenderTest, BackupManagerServiceTest, TarBackupReaderTest, KeyValuBackupTaskTest, KeyValueBackupReporterTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:073d1f1e6abb73ea47a24e670f79e7a488e823ed) Merged-In: Idba7eb5342038a86b34e73f63892a7a7d93bf894 Change-Id: Idba7eb5342038a86b34e73f63892a7a7d93bf894 --- .../android/server/backup/keyvalue/KeyValueBackupReporterTest.java | 6 +++++- .../com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'services/robotests') diff --git a/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupReporterTest.java b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupReporterTest.java index 14b4dc3dc7d0..2db2438b9a21 100644 --- a/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupReporterTest.java +++ b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupReporterTest.java @@ -27,6 +27,7 @@ import android.platform.test.annotations.Presubmit; import android.util.Log; import com.android.server.backup.UserBackupManagerService; +import com.android.server.backup.utils.BackupManagerMonitorEventSender; import com.android.server.testing.shadows.ShadowEventLog; import com.android.server.testing.shadows.ShadowSlog; @@ -46,10 +47,13 @@ public class KeyValueBackupReporterTest { @Mock private IBackupManagerMonitor mMonitor; private KeyValueBackupReporter mReporter; + private BackupManagerMonitorEventSender mBackupManagerMonitorEventSender; @Before public void setUp() { - mReporter = new KeyValueBackupReporter(mBackupManagerService, mObserver, mMonitor); + mBackupManagerMonitorEventSender = new BackupManagerMonitorEventSender(mMonitor); + mReporter = new KeyValueBackupReporter( + mBackupManagerService, mObserver, mBackupManagerMonitorEventSender); } @Test diff --git a/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java index bfbc0f50f67a..7349c14ef62b 100644 --- a/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java +++ b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java @@ -122,6 +122,7 @@ import com.android.server.backup.testing.TransportData; import com.android.server.backup.testing.TransportTestUtils; import com.android.server.backup.testing.TransportTestUtils.TransportMock; import com.android.server.backup.utils.BackupEligibilityRules; +import com.android.server.backup.utils.BackupManagerMonitorEventSender; import com.android.server.testing.shadows.FrameworkShadowLooper; import com.android.server.testing.shadows.ShadowApplicationPackageManager; import com.android.server.testing.shadows.ShadowBackupDataInput; @@ -260,7 +261,8 @@ public class KeyValueBackupTaskTest { mBackupHandler = mBackupManagerService.getBackupHandler(); mShadowBackupLooper = shadowOf(mBackupHandler.getLooper()); ShadowEventLog.setUp(); - mReporter = spy(new KeyValueBackupReporter(mBackupManagerService, mObserver, mMonitor)); + mReporter = spy(new KeyValueBackupReporter(mBackupManagerService, mObserver, + new BackupManagerMonitorEventSender(mMonitor))); when(mPackageManagerInternal.getApplicationEnabledState(any(), anyInt())) .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED); -- cgit v1.2.3-59-g8ed1b