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

Commit 935664ad authored by Yuri Lin's avatar Yuri Lin Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypick-jr-owner-azffbn1bzv" into rvc-qpr-dev 

* changes:
  Enforce zen rule limit on a package level.
  Fix NPE when deleting old zen rules
  Store DND rule owners
parents d0824691 76c78aa2

core/java/android/app/AutomaticZenRule.java

+20 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ public final class AutomaticZenRule implements Parcelable { 
    private long creationTime;

    private ZenPolicy mZenPolicy;

    private boolean mModified = false;

    private String mPkg;



    /**

     * Creates an automatic zen rule.
@@ -123,6 +124,7 @@ public final class AutomaticZenRule implements Parcelable { 
        creationTime = source.readLong();

        mZenPolicy = source.readParcelable(null);

        mModified = source.readInt() == ENABLED;

        mPkg = source.readString();

    }



    /**
@@ -244,6 +246,20 @@ public final class AutomaticZenRule implements Parcelable { 
        this.configurationActivity = componentName;

    }



    /**

     * @hide

     */

    public void setPackageName(String pkgName) {

        mPkg = pkgName;

    }



    /**

     * @hide

     */

    public String getPackageName() {

        return mPkg;

    }



    @Override

    public int describeContents() {

        return 0;
@@ -265,6 +281,7 @@ public final class AutomaticZenRule implements Parcelable { 
        dest.writeLong(creationTime);

        dest.writeParcelable(mZenPolicy, 0);

        dest.writeInt(mModified ? ENABLED : DISABLED);

        dest.writeString(mPkg);

    }



    @Override
@@ -273,6 +290,7 @@ public final class AutomaticZenRule implements Parcelable { 
                .append("enabled=").append(enabled)

                .append(",name=").append(name)

                .append(",interruptionFilter=").append(interruptionFilter)

                .append(",pkg=").append(mPkg)

                .append(",conditionId=").append(conditionId)

                .append(",owner=").append(owner)

                .append(",configActivity=").append(configurationActivity)
@@ -294,13 +312,14 @@ public final class AutomaticZenRule implements Parcelable { 
                && Objects.equals(other.owner, owner)

                && Objects.equals(other.mZenPolicy, mZenPolicy)

                && Objects.equals(other.configurationActivity, configurationActivity)

                && Objects.equals(other.mPkg, mPkg)

                && other.creationTime == creationTime;

    }



    @Override

    public int hashCode() {

        return Objects.hash(enabled, name, interruptionFilter, conditionId, owner,

                configurationActivity, mZenPolicy, mModified, creationTime);

                configurationActivity, mZenPolicy, mModified, creationTime, mPkg);

    }



    public static final @android.annotation.NonNull Parcelable.Creator<AutomaticZenRule> CREATOR

core/java/android/app/INotificationManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ interface INotificationManager 
    void setNotificationPolicyAccessGrantedForUser(String pkg, int userId, boolean granted);

    AutomaticZenRule getAutomaticZenRule(String id);

    List<ZenModeConfig.ZenRule> getZenRules();

    String addAutomaticZenRule(in AutomaticZenRule automaticZenRule);

    String addAutomaticZenRule(in AutomaticZenRule automaticZenRule, String pkg);

    boolean updateAutomaticZenRule(String id, in AutomaticZenRule automaticZenRule);

    boolean removeAutomaticZenRule(String id);

    boolean removeAutomaticZenRules(String packageName);

core/java/android/app/NotificationManager.java

+5 −3
Original line number Diff line number Diff line
@@ -1072,10 +1072,12 @@ public class NotificationManager { 
            List<ZenModeConfig.ZenRule> rules = service.getZenRules();

            Map<String, AutomaticZenRule> ruleMap = new HashMap<>();

            for (ZenModeConfig.ZenRule rule : rules) {

                ruleMap.put(rule.id, new AutomaticZenRule(rule.name, rule.component,

                AutomaticZenRule azr = new AutomaticZenRule(rule.name, rule.component,

                        rule.configurationActivity, rule.conditionId, rule.zenPolicy,

                        zenModeToInterruptionFilter(rule.zenMode), rule.enabled,

                        rule.creationTime));

                        rule.creationTime);

                azr.setPackageName(rule.pkg);

                ruleMap.put(rule.id, azr);

            }

            return ruleMap;

        } catch (RemoteException e) {
@@ -1116,7 +1118,7 @@ public class NotificationManager { 
    public String addAutomaticZenRule(AutomaticZenRule automaticZenRule) {

        INotificationManager service = getService();

        try {

            return service.addAutomaticZenRule(automaticZenRule);

            return service.addAutomaticZenRule(automaticZenRule, mContext.getPackageName());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/android/service/notification/ZenModeConfig.java

+10 −5
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.util.Slog; 
import android.util.proto.ProtoOutputStream;



import com.android.internal.R;

import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -159,6 +160,7 @@ public class ZenModeConfig implements Parcelable { 
    private static final String RULE_ATT_ENABLED = "enabled";

    private static final String RULE_ATT_SNOOZING = "snoozing";

    private static final String RULE_ATT_NAME = "name";

    private static final String RULE_ATT_PKG = "pkg";

    private static final String RULE_ATT_COMPONENT = "component";

    private static final String RULE_ATT_CONFIG_ACTIVITY = "configActivity";

    private static final String RULE_ATT_ZEN = "zen";
@@ -669,11 +671,11 @@ public class ZenModeConfig implements Parcelable { 
        rt.conditionId = safeUri(parser, RULE_ATT_CONDITION_ID);

        rt.component = safeComponentName(parser, RULE_ATT_COMPONENT);

        rt.configurationActivity = safeComponentName(parser, RULE_ATT_CONFIG_ACTIVITY);

        rt.pkg = (rt.component != null)

                ? rt.component.getPackageName()

                : (rt.configurationActivity != null)

                        ? rt.configurationActivity.getPackageName()

                        : null;

        rt.pkg = XmlUtils.readStringAttribute(parser, RULE_ATT_PKG);

        if (rt.pkg == null) {

            // backfill from component, if present. configActivity is not safe to backfill from

            rt.pkg = rt.component != null ? rt.component.getPackageName() : null;

        }

        rt.creationTime = safeLong(parser, RULE_ATT_CREATION_TIME, 0);

        rt.enabler = parser.getAttributeValue(null, RULE_ATT_ENABLER);

        rt.condition = readConditionXml(parser);
@@ -695,6 +697,9 @@ public class ZenModeConfig implements Parcelable { 
            out.attribute(null, RULE_ATT_NAME, rule.name);

        }

        out.attribute(null, RULE_ATT_ZEN, Integer.toString(rule.zenMode));

        if (rule.pkg != null) {

            out.attribute(null, RULE_ATT_PKG, rule.pkg);

        }

        if (rule.component != null) {

            out.attribute(null, RULE_ATT_COMPONENT, rule.component.flattenToString());

        }

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -4465,7 +4465,7 @@ public class NotificationManagerService extends SystemService { 
        }



        @Override

        public String addAutomaticZenRule(AutomaticZenRule automaticZenRule) {

        public String addAutomaticZenRule(AutomaticZenRule automaticZenRule, String pkg) {

            Objects.requireNonNull(automaticZenRule, "automaticZenRule is null");

            Objects.requireNonNull(automaticZenRule.getName(), "Name is null");

            if (automaticZenRule.getOwner() == null
@@ -4474,6 +4474,7 @@ public class NotificationManagerService extends SystemService { 
                        "Rule must have a conditionproviderservice and/or configuration activity");

            }

            Objects.requireNonNull(automaticZenRule.getConditionId(), "ConditionId is null");

            checkCallerIsSameApp(pkg);

            if (automaticZenRule.getZenPolicy() != null

                    && automaticZenRule.getInterruptionFilter() != INTERRUPTION_FILTER_PRIORITY) {

                throw new IllegalArgumentException("ZenPolicy is only applicable to "
@@ -4481,7 +4482,7 @@ public class NotificationManagerService extends SystemService { 
            }

            enforcePolicyAccess(Binder.getCallingUid(), "addAutomaticZenRule");



            return mZenModeHelper.addAutomaticZenRule(automaticZenRule,

            return mZenModeHelper.addAutomaticZenRule(pkg, automaticZenRule,

                    "addAutomaticZenRule");

        }