commit fff7d29de21d1a3caa4b048346361f750d5dc57f
author Matías Hernández <matiashe@google.com> Mon Mar 25 14:38:39 2024 +0100
committer Matías Hernández <matiashe@google.com> Mon Mar 25 14:47:28 2024 +0100
tree 5e909990d0a8f309ce2f19486abfa6af8c50f853
parent 97c7930d070bddf59c9cfa5d780a836ef7096b36

AutomaticZenRule.Builder - default type should be UNKNOWN

Test: atest android.app.AutomaticZenRuleTest
Fixes: 330913671

Change-Id: If94b3279c8f8dbad819f8332cf63e7441bd9a693

core/java/android/app/AutomaticZenRule.java

diff --git a/core/java/android/app/AutomaticZenRule.java b/core/java/android/app/AutomaticZenRule.java
index 33d41d3..308178c 100644
--- a/core/java/android/app/AutomaticZenRule.java
+++ b/core/java/android/app/AutomaticZenRule.java
@@ -676,7 +676,7 @@
         private ComponentName mConfigurationActivity = null;
         private ZenPolicy mPolicy = null;
         private ZenDeviceEffects mDeviceEffects = null;
-        private int mType;
+        private int mType = TYPE_UNKNOWN;
         private String mDescription;
         private int mIconResId;
         private boolean mAllowManualInvocation;

core/tests/coretests/src/android/app/AutomaticZenRuleTest.java

diff --git a/core/tests/coretests/src/android/app/AutomaticZenRuleTest.java b/core/tests/coretests/src/android/app/AutomaticZenRuleTest.java
index 33f37da..a5c8545 100644
--- a/core/tests/coretests/src/android/app/AutomaticZenRuleTest.java
+++ b/core/tests/coretests/src/android/app/AutomaticZenRuleTest.java
@@ -16,6 +16,8 @@
 
 package android.app;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.fail;
 
@@ -177,6 +179,24 @@
 
     @Test
     @EnableFlags(Flags.FLAG_MODES_API)
+    public void constructor_defaultTypeUnknown() {
+        AutomaticZenRule rule = new AutomaticZenRule("name", new ComponentName("pkg", "cps"), null,
+                Uri.parse("conditionId"), null, NotificationManager.INTERRUPTION_FILTER_PRIORITY,
+                true);
+
+        assertThat(rule.getType()).isEqualTo(AutomaticZenRule.TYPE_UNKNOWN);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_MODES_API)
+    public void builder_defaultTypeUnknown() {
+        AutomaticZenRule rule = new AutomaticZenRule.Builder("name",
+                Uri.parse("conditionId")).build();
+
+        assertThat(rule.getType()).isEqualTo(AutomaticZenRule.TYPE_UNKNOWN);
+    }
+    @Test
+    @EnableFlags(Flags.FLAG_MODES_API)
     public void validate_builderWithValidType_succeeds() throws Exception {
         AutomaticZenRule rule = new AutomaticZenRule.Builder("rule", Uri.parse("uri"))
                 .setType(AutomaticZenRule.TYPE_BEDTIME)