2 files changed, 15 insertions, 4 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index 1a0e20c10a1a..e2f49398e3ed 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -369,11 +369,14 @@ package android.app {
   }
 
   public class NotificationManager {
+    method @FlaggedApi("android.app.modes_api") @NonNull public String addAutomaticZenRule(@NonNull android.app.AutomaticZenRule, boolean);
     method public void cleanUpCallersAfter(long);
     method public android.content.ComponentName getEffectsSuppressor();
     method public boolean isNotificationPolicyAccessGrantedForPackage(@NonNull String);
+    method @FlaggedApi("android.app.modes_api") public boolean removeAutomaticZenRule(@NonNull String, boolean);
     method @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public void setNotificationListenerAccessGranted(@NonNull android.content.ComponentName, boolean, boolean);
     method @RequiresPermission(android.Manifest.permission.MANAGE_TOAST_RATE_LIMITING) public void setToastRateLimitingEnabled(boolean);
+    method @FlaggedApi("android.app.modes_api") public boolean updateAutomaticZenRule(@NonNull String, @NonNull android.app.AutomaticZenRule, boolean);
     method public void updateNotificationChannel(@NonNull String, int, @NonNull android.app.NotificationChannel);
   }
 
diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java
index c819ef46eab1..f76a45b37661 100644
--- a/core/java/android/app/NotificationManager.java
+++ b/core/java/android/app/NotificationManager.java
@@ -1335,7 +1335,11 @@ public class NotificationManager {
     }
 
     /** @hide */
-    public String addAutomaticZenRule(AutomaticZenRule automaticZenRule, boolean fromUser) {
+    @TestApi
+    @FlaggedApi(Flags.FLAG_MODES_API)
+    @NonNull
+    public String addAutomaticZenRule(@NonNull AutomaticZenRule automaticZenRule,
+            boolean fromUser) {
         INotificationManager service = getService();
         try {
             return service.addAutomaticZenRule(automaticZenRule,
@@ -1363,8 +1367,10 @@ public class NotificationManager {
     }
 
     /** @hide */
-    public boolean updateAutomaticZenRule(String id, AutomaticZenRule automaticZenRule,
-            boolean fromUser) {
+    @TestApi
+    @FlaggedApi(Flags.FLAG_MODES_API)
+    public boolean updateAutomaticZenRule(@NonNull String id,
+            @NonNull AutomaticZenRule automaticZenRule, boolean fromUser) {
         INotificationManager service = getService();
         try {
             return service.updateAutomaticZenRule(id, automaticZenRule, fromUser);
@@ -1421,7 +1427,9 @@ public class NotificationManager {
     }
 
     /** @hide */
-    public boolean removeAutomaticZenRule(String id, boolean fromUser) {
+    @TestApi
+    @FlaggedApi(Flags.FLAG_MODES_API)
+    public boolean removeAutomaticZenRule(@NonNull String id, boolean fromUser) {
         INotificationManager service = getService();
         try {
             return service.removeAutomaticZenRule(id, fromUser);