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

Commit f4fb94ce authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge changes I1149cb5b,Ib89a17aa 

* changes:
  Allow condition providers to specify a rule instance limit.
  Verify zen rule owners before persisting rules.
parents 3c288e6f 43b70cdc

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -33620,6 +33620,7 @@ package android.service.notification { 
    method public abstract void onUnsubscribe(android.net.Uri);

    field public static final java.lang.String EXTRA_RULE_ID = "android.content.automatic.ruleId";

    field public static final java.lang.String META_DATA_CONFIGURATION_ACTIVITY = "android.service.zen.automatic.configurationActivity";

    field public static final java.lang.String META_DATA_RULE_INSTANCE_LIMIT = "android.service.zen.automatic.ruleInstanceLimit";

    field public static final java.lang.String META_DATA_RULE_TYPE = "android.service.zen.automatic.ruleType";

    field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";

  }

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35766,6 +35766,7 @@ package android.service.notification { 
    method public abstract void onUnsubscribe(android.net.Uri);

    field public static final java.lang.String EXTRA_RULE_ID = "android.content.automatic.ruleId";

    field public static final java.lang.String META_DATA_CONFIGURATION_ACTIVITY = "android.service.zen.automatic.configurationActivity";

    field public static final java.lang.String META_DATA_RULE_INSTANCE_LIMIT = "android.service.zen.automatic.ruleInstanceLimit";

    field public static final java.lang.String META_DATA_RULE_TYPE = "android.service.zen.automatic.ruleType";

    field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";

  }

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -33634,6 +33634,7 @@ package android.service.notification { 
    method public abstract void onUnsubscribe(android.net.Uri);

    field public static final java.lang.String EXTRA_RULE_ID = "android.content.automatic.ruleId";

    field public static final java.lang.String META_DATA_CONFIGURATION_ACTIVITY = "android.service.zen.automatic.configurationActivity";

    field public static final java.lang.String META_DATA_RULE_INSTANCE_LIMIT = "android.service.zen.automatic.ruleInstanceLimit";

    field public static final java.lang.String META_DATA_RULE_TYPE = "android.service.zen.automatic.ruleType";

    field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";

  }

core/java/android/app/INotificationManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ interface INotificationManager 
    boolean updateAutomaticZenRule(in AutomaticZenRule automaticZenRule);

    boolean removeAutomaticZenRule(String id);

    boolean removeAutomaticZenRules(String packageName);

    int getRuleInstanceCount(in ComponentName owner);



    byte[] getBackupPayload(int user);

    void applyRestore(in byte[] payload, int user);

core/java/android/app/NotificationManager.java

+12 −0
Original line number Diff line number Diff line
@@ -379,6 +379,18 @@ public class NotificationManager 
        return null;

    }



    /**

     * @hide

     */

    public int getRuleInstanceCount(ComponentName owner) {

        INotificationManager service = getService();

        try {

            return service.getRuleInstanceCount(owner);

        } catch (RemoteException e) {

        }

        return 0;

    }



    /**

     * Returns AutomaticZenRules owned by the caller.

     *