diff options
2 files changed, 42 insertions, 2 deletions
diff --git a/services/backup/java/com/android/server/backup/utils/BackupManagerMonitorEventSender.java b/services/backup/java/com/android/server/backup/utils/BackupManagerMonitorEventSender.java index 92e3107b6977..549d08c03933 100644 --- a/services/backup/java/com/android/server/backup/utils/BackupManagerMonitorEventSender.java +++ b/services/backup/java/com/android/server/backup/utils/BackupManagerMonitorEventSender.java @@ -222,4 +222,21 @@ public class BackupManagerMonitorEventSender { extras.putBoolean(key, value); return extras; } + + /** + * Adds given key-value pair in the bundle and returns the bundle. If bundle was null it will + * be created. + * + * @param extras - bundle where to add key-value to, if null a new bundle will be created. + * @param key - key. + * @param value - value. + * @return extras if it was not null and new bundle otherwise. + */ + public static Bundle putMonitoringExtra(Bundle extras, String key, int value) { + if (extras == null) { + extras = new Bundle(); + } + extras.putInt(key, value); + return extras; + } } diff --git a/services/tests/mockingservicestests/src/com/android/server/backup/utils/BackupManagerMonitorEventSenderTest.java b/services/tests/mockingservicestests/src/com/android/server/backup/utils/BackupManagerMonitorEventSenderTest.java index 3af2932ee937..604a68d12f5e 100644 --- a/services/tests/mockingservicestests/src/com/android/server/backup/utils/BackupManagerMonitorEventSenderTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/backup/utils/BackupManagerMonitorEventSenderTest.java @@ -340,8 +340,9 @@ public class BackupManagerMonitorEventSenderTest { @Test public void putMonitoringExtraLong_bundleExists_fillsBundleCorrectly() throws Exception { Bundle bundle = new Bundle(); + long value = 123; - Bundle result = mBackupManagerMonitorEventSender.putMonitoringExtra(bundle, "key", 123); + Bundle result = mBackupManagerMonitorEventSender.putMonitoringExtra(bundle, "key", value); assertThat(result).isEqualTo(bundle); assertThat(result.size()).isEqualTo(1); @@ -350,7 +351,8 @@ public class BackupManagerMonitorEventSenderTest { @Test public void putMonitoringExtraLong_bundleDoesNotExist_fillsBundleCorrectly() throws Exception { - Bundle result = mBackupManagerMonitorEventSender.putMonitoringExtra(null, "key", 123); + long value = 123; + Bundle result = mBackupManagerMonitorEventSender.putMonitoringExtra(null, "key", value); assertThat(result).isNotNull(); assertThat(result.size()).isEqualTo(1); @@ -377,4 +379,25 @@ public class BackupManagerMonitorEventSenderTest { assertThat(result.size()).isEqualTo(1); assertThat(result.getBoolean("key")).isTrue(); } + + @Test + public void putMonitoringExtraInt_bundleExists_fillsBundleCorrectly() throws Exception { + Bundle bundle = new Bundle(); + + Bundle result = mBackupManagerMonitorEventSender.putMonitoringExtra(bundle, "key", 1); + + assertThat(result).isEqualTo(bundle); + assertThat(result.size()).isEqualTo(1); + assertThat(result.getInt("key")).isEqualTo(1); + } + + @Test + public void putMonitoringExtraInt_bundleDoesNotExist_fillsBundleCorrectly() + throws Exception { + Bundle result = mBackupManagerMonitorEventSender.putMonitoringExtra(null, "key", 1); + + assertThat(result).isNotNull(); + assertThat(result.size()).isEqualTo(1); + assertThat(result.getInt("key")).isEqualTo(1); + } } |