Merge "Generate sequential instead of random rule ids in TestModeBuilder" into main

1 files changed, 4 insertions, 2 deletions

diff --git a/packages/SettingsLib/src/com/android/settingslib/notification/modes/TestModeBuilder.java b/packages/SettingsLib/src/com/android/settingslib/notification/modes/TestModeBuilder.java
index 64a2de5025de..ecea5fd35150 100644
--- a/packages/SettingsLib/src/com/android/settingslib/notification/modes/TestModeBuilder.java
+++ b/packages/SettingsLib/src/com/android/settingslib/notification/modes/TestModeBuilder.java
@@ -33,10 +33,12 @@ import android.service.notification.ZenPolicy;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 
-import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class TestModeBuilder {
 
+    private static final AtomicInteger sNextId = new AtomicInteger(0);
+
     private String mId;
     private AutomaticZenRule mRule;
     private ZenModeConfig.ZenRule mConfigZenRule;
@@ -47,7 +49,7 @@ public class TestModeBuilder {
 
     public TestModeBuilder() {
         // Reasonable defaults
-        int id = new Random().nextInt(1000);
+        int id = sNextId.incrementAndGet();
         mId = "rule_" + id;
         mRule = new AutomaticZenRule.Builder("Test Rule #" + id, Uri.parse("rule://" + id))
                 .setPackage("some_package")