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

Commit 0d5f65a7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Un-deprecate AutomaticZenRule constructor" into main

parents 53ce8719 2d670912

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5395,7 +5395,7 @@ package android.app { 














  public final class AutomaticZenRule implements android.os.Parcelable {















    ctor @Deprecated public AutomaticZenRule(String, android.content.ComponentName, android.net.Uri, int, boolean);













    ctor @Deprecated public AutomaticZenRule(@NonNull String, @Nullable android.content.ComponentName, @Nullable android.content.ComponentName, @NonNull android.net.Uri, @Nullable android.service.notification.ZenPolicy, int, boolean);













    ctor public AutomaticZenRule(@NonNull String, @Nullable android.content.ComponentName, @Nullable android.content.ComponentName, @NonNull android.net.Uri, @Nullable android.service.notification.ZenPolicy, int, boolean);















    ctor public AutomaticZenRule(android.os.Parcel);















    method public int describeContents();















    method public android.net.Uri getConditionId();

























core/java/android/app/AutomaticZenRule.java



+2
−3




























Original line number
Diff line number
Diff line








@@ -185,6 +185,8 @@ public final class AutomaticZenRule implements Parcelable {













    /**















     * Creates an automatic zen rule.















     *













     * <p>Note: Prefer {@link AutomaticZenRule.Builder} to construct an {@link AutomaticZenRule}.













     *















     * @param name The name of the rule.















     * @param owner The Condition Provider service that owns this rule. This can be null if you're















     *              using {@link NotificationManager#setAutomaticZenRuleState(String, Condition)}









@@ -206,10 +208,7 @@ public final class AutomaticZenRule implements Parcelable {













     *               while this rule is active. This overrides the global policy while this rule is















     *               action ({@link Condition#STATE_TRUE}).















     * @param enabled Whether the rule is enabled.













     *













     * @deprecated Use {@link AutomaticZenRule.Builder} to construct an {@link AutomaticZenRule}.















     */













    @Deprecated















    public AutomaticZenRule(@NonNull String name, @Nullable ComponentName owner,















            @Nullable ComponentName configurationActivity, @NonNull Uri conditionId,















            @Nullable ZenPolicy policy, int interruptionFilter, boolean enabled) {