Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0366a753 authored by Matías Hernández's avatar Matías Hernández
Browse files

Expose AZR-related methods with fromUser as @TestApi 

So they can be used in CTS.

Test: atest NotificationManagerZenTest
Bug: 308670715
Change-Id: I59aff9667920f100439cd169eeb424996cf6a743
parent 16d90af8

core/api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -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);

  }

core/java/android/app/NotificationManager.java

+12 −4
Original line number Diff line number Diff line
@@ -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);