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

Commit c0ca2f82 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal Committed by Alexandre Roux
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parent 67a8d6ed

core/java/android/accounts/Account.java

+0 −7
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.util.Log; 


import com.android.internal.annotations.GuardedBy;



import java.util.Objects;

import java.util.Set;



/**
@@ -86,12 +85,6 @@ public class Account implements Parcelable { 
        if (TextUtils.isEmpty(type)) {

            throw new IllegalArgumentException("the type must not be empty: " + type);

        }

        if (name.length() > 200) {

            throw new IllegalArgumentException("account name is longer than 200 characters");

        }

        if (type.length() > 200) {

            throw new IllegalArgumentException("account type is longer than 200 characters");

        }

        this.name = name;

        this.type = type;

        this.accessId = accessId;

core/java/android/app/AutomaticZenRule.java

+68 −11
Original line number Diff line number Diff line
@@ -45,6 +45,14 @@ public final class AutomaticZenRule implements Parcelable { 
    private long creationTime;

    private ZenPolicy mZenPolicy;

    private boolean mModified = false;

    private String mPkg;



    /**

     * The maximum string length for any string contained in this automatic zen rule. This pertains

     * both to fields in the rule itself (such as its name) and items with sub-fields.

     * @hide

     */

    public static final int MAX_STRING_LENGTH = 1000;



    /**

     * Creates an automatic zen rule.
@@ -92,10 +100,10 @@ public final class AutomaticZenRule implements Parcelable { 
    public AutomaticZenRule(@NonNull String name, @Nullable ComponentName owner,

            @Nullable ComponentName configurationActivity, @NonNull Uri conditionId,

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

        this.name = name;

        this.owner = owner;

        this.configurationActivity = configurationActivity;

        this.conditionId = conditionId;

        this.name = getTrimmedString(name);

        this.owner = getTrimmedComponentName(owner);

        this.configurationActivity = getTrimmedComponentName(configurationActivity);

        this.conditionId = getTrimmedUri(conditionId);

        this.interruptionFilter = interruptionFilter;

        this.enabled = enabled;

        this.mZenPolicy = policy;
@@ -114,15 +122,16 @@ public final class AutomaticZenRule implements Parcelable { 
    public AutomaticZenRule(Parcel source) {

        enabled = source.readInt() == ENABLED;

        if (source.readInt() == ENABLED) {

            name = source.readString();

            name = getTrimmedString(source.readString());

        }

        interruptionFilter = source.readInt();

        conditionId = source.readParcelable(null);

        owner = source.readParcelable(null);

        configurationActivity = source.readParcelable(null);

        owner = getTrimmedComponentName(source.readParcelable(null));

        configurationActivity = getTrimmedComponentName(source.readParcelable(null));

        creationTime = source.readLong();

        mZenPolicy = source.readParcelable(null);

        mModified = source.readInt() == ENABLED;

        mPkg = source.readString();

    }



    /**
@@ -194,7 +203,7 @@ public final class AutomaticZenRule implements Parcelable { 
     * Sets the representation of the state that causes this rule to become active.

     */

    public void setConditionId(Uri conditionId) {

        this.conditionId = conditionId;

        this.conditionId = getTrimmedUri(conditionId);

    }



    /**
@@ -209,7 +218,7 @@ public final class AutomaticZenRule implements Parcelable { 
     * Sets the name of this rule.

     */

    public void setName(String name) {

        this.name = name;

        this.name = getTrimmedString(name);

    }



    /**
@@ -241,7 +250,21 @@ public final class AutomaticZenRule implements Parcelable { 
     * that are not backed by {@link android.service.notification.ConditionProviderService}.

     */

    public void setConfigurationActivity(@Nullable ComponentName componentName) {

        this.configurationActivity = componentName;

        this.configurationActivity = getTrimmedComponentName(componentName);

    }



    /**

     * @hide

     */

    public void setPackageName(String pkgName) {

        mPkg = pkgName;

    }



    /**

     * @hide

     */

    public String getPackageName() {

        return mPkg;

    }



    @Override
@@ -265,6 +288,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 +297,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 +319,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
@@ -314,4 +340,35 @@ public final class AutomaticZenRule implements Parcelable { 
            return new AutomaticZenRule[size];

        }

    };



    /**

     * If the package or class name of the provided ComponentName are longer than MAX_STRING_LENGTH,

     * return a trimmed version that truncates each of the package and class name at the max length.

     */

    private static ComponentName getTrimmedComponentName(ComponentName cn) {

        if (cn == null) return null;

        return new ComponentName(getTrimmedString(cn.getPackageName()),

                getTrimmedString(cn.getClassName()));

    }



    /**

     * Returns a truncated copy of the string if the string is longer than MAX_STRING_LENGTH.

     */

    private static String getTrimmedString(String input) {

        if (input != null && input.length() > MAX_STRING_LENGTH) {

            return input.substring(0, MAX_STRING_LENGTH);

        }

        return input;

    }



    /**

     * Returns a truncated copy of the Uri by trimming the string representation to the maximum

     * string length.

     */

    private static Uri getTrimmedUri(Uri input) {

        if (input != null && input.toString().length() > MAX_STRING_LENGTH) {

            return Uri.parse(getTrimmedString(input.toString()));

        }

        return input;

    }

}

core/java/android/app/INotificationManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,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/content/pm/parsing/ParsingPackageUtils.java

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE; 
import static android.content.pm.PackageManager.FEATURE_WATCH;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_MANIFEST;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_ONLY_COREAPP_ALLOWED;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_RESOURCES_ARSC_COMPRESSED;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION;
@@ -778,6 +779,13 @@ public class ParsingPackageUtils { 
            );

        }



        if (ParsedPermissionUtils.declareDuplicatePermission(pkg)) {

            return input.error(

                    INSTALL_PARSE_FAILED_MANIFEST_MALFORMED,

                    "Found duplicate permission with a different attribute value."

            );

        }



        convertNewPermissions(pkg);



        convertSplitPermissions(pkg);