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

Commit 4656a9e3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "API council feedback for dnd"

parents be45bbdc 395bf705

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5848,8 +5848,8 @@ package android.app { 
    field public static final int INTERRUPTION_FILTER_NONE = 3; // 0x3

    field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2

    field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0

    field public static final String META_DATA_AUTOMATIC_RULE_TYPE = "android.app.automatic.ruleType";

    field public static final String META_DATA_RULE_INSTANCE_LIMIT = "android.app.zen.automatic.ruleInstanceLimit";

    field public static final String META_DATA_AUTOMATIC_RULE_TYPE = "android.service.zen.automatic.ruleType";

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

  }















  public static class NotificationManager.Policy implements android.os.Parcelable {

























core/java/android/app/AutomaticZenRule.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -231,7 +231,7 @@ public final class AutomaticZenRule implements Parcelable {













     * Sets the zen policy.















     */















    public void setZenPolicy(ZenPolicy zenPolicy) {













        this.mZenPolicy = zenPolicy;













        this.mZenPolicy = (zenPolicy == null ? null : zenPolicy.copy());















    }































    /**

































core/java/android/app/NotificationManager.java



+3
−2




























Original line number
Diff line number
Diff line








@@ -315,7 +315,8 @@ public class NotificationManager {













     * This tag should contain a localized name of the type of the zen rule provided by the















     * activity.















     */













    public static final String META_DATA_AUTOMATIC_RULE_TYPE = "android.app.automatic.ruleType";













    public static final String META_DATA_AUTOMATIC_RULE_TYPE =













            "android.service.zen.automatic.ruleType";































    /**















     * An optional {@code meta-data} tag for activities that handle









@@ -325,7 +326,7 @@ public class NotificationManager {













     * can be created for this rule type. Omit or enter a value <= 0 to allow unlimited instances.















     */















    public static final String META_DATA_RULE_INSTANCE_LIMIT =













            "android.app.zen.automatic.ruleInstanceLimit";













            "android.service.zen.automatic.ruleInstanceLimit";































    /** Value signifying that the user has not expressed a per-app visibility override value.















     * @hide */