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

Commit bce1e0db authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-19.1' into v1-s

parents 42d50e75 3dcc4ea9

apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java

+28 −0
Original line number Diff line number Diff line
@@ -32,11 +32,13 @@ import android.os.RemoteCallback; 
import android.os.RemoteException;

import android.os.UserHandle;



import com.android.internal.util.Preconditions;

import com.android.internal.util.function.pooled.PooledLambda;



import java.io.Closeable;

import java.io.IOException;

import java.util.List;

import java.util.Objects;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.Executor;

import java.util.concurrent.TimeUnit;
@@ -153,6 +155,26 @@ public class BlobStoreManager { 
    private final Context mContext;

    private final IBlobStoreManager mService;



    // TODO: b/404309424 - Make these constants available using a test-api to avoid hardcoding

    // them in tests.

    /**

     * The maximum allowed length for the package name, provided using

     * {@link BlobStoreManager.Session#allowPackageAccess(String, byte[])}.

     *

     * This is the same limit that is already used for limiting the length of the package names

     * at android.content.pm.parsing.FrameworkParsingPackageUtils#MAX_FILE_NAME_SIZE.

     *

     * @hide

     */

    public static final int MAX_PACKAGE_NAME_LENGTH = 223;

    /**

     * The maximum allowed length for the certificate, provided using

     * {@link BlobStoreManager.Session#allowPackageAccess(String, byte[])}.

     *

     * @hide

     */

    public static final int MAX_CERTIFICATE_LENGTH = 32;



    /** @hide */

    public BlobStoreManager(@NonNull Context context, @NonNull IBlobStoreManager service) {

        mContext = context;
@@ -770,6 +792,12 @@ public class BlobStoreManager { 
         */

        public void allowPackageAccess(@NonNull String packageName, @NonNull byte[] certificate)

                throws IOException {

            Objects.requireNonNull(packageName);

            Preconditions.checkArgument(packageName.length() <= MAX_PACKAGE_NAME_LENGTH,

                    "packageName is longer than " + MAX_PACKAGE_NAME_LENGTH + " chars");

            Objects.requireNonNull(certificate);

            Preconditions.checkArgument(certificate.length <= MAX_CERTIFICATE_LENGTH,

                    "certificate is longer than " + MAX_CERTIFICATE_LENGTH + " chars");

            try {

                mSession.allowPackageAccess(packageName, certificate);

            } catch (ParcelableException e) {

apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
package com.android.server.blob;



import static android.app.blob.BlobStoreManager.COMMIT_RESULT_ERROR;

import static android.app.blob.BlobStoreManager.MAX_CERTIFICATE_LENGTH;

import static android.app.blob.BlobStoreManager.MAX_PACKAGE_NAME_LENGTH;

import static android.app.blob.XmlTags.ATTR_CREATION_TIME_MS;

import static android.app.blob.XmlTags.ATTR_ID;

import static android.app.blob.XmlTags.ATTR_PACKAGE;
@@ -327,6 +329,11 @@ class BlobStoreSession extends IBlobStoreSession.Stub { 
            @NonNull byte[] certificate) {

        assertCallerIsOwner();

        Objects.requireNonNull(packageName, "packageName must not be null");

        Preconditions.checkArgument(packageName.length() <= MAX_PACKAGE_NAME_LENGTH,

                "packageName is longer than " + MAX_PACKAGE_NAME_LENGTH + " chars");

        Objects.requireNonNull(certificate, "certificate must not be null");

        Preconditions.checkArgument(certificate.length <= MAX_CERTIFICATE_LENGTH,

                "certificate is longer than " + MAX_CERTIFICATE_LENGTH + " chars");

        synchronized (mSessionLock) {

            if (mState != STATE_OPENED) {

                throw new IllegalStateException("Not allowed to change access type in state: "

core/java/android/app/AutomaticZenRule.java

+4 −4
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public final class AutomaticZenRule implements Parcelable { 
    public AutomaticZenRule(Parcel source) {

        enabled = source.readInt() == ENABLED;

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

            name = getTrimmedString(source.readString());

            name = getTrimmedString(source.readString8());

        }

        interruptionFilter = source.readInt();

        conditionId = getTrimmedUri(source.readParcelable(null));
@@ -131,7 +131,7 @@ public final class AutomaticZenRule implements Parcelable { 
        creationTime = source.readLong();

        mZenPolicy = source.readParcelable(null);

        mModified = source.readInt() == ENABLED;

        mPkg = source.readString();

        mPkg = source.readString8();

    }



    /**
@@ -277,7 +277,7 @@ public final class AutomaticZenRule implements Parcelable { 
        dest.writeInt(enabled ? ENABLED : DISABLED);

        if (name != null) {

            dest.writeInt(1);

            dest.writeString(name);

            dest.writeString8(name);

        } else {

            dest.writeInt(0);

        }
@@ -288,7 +288,7 @@ public final class AutomaticZenRule implements Parcelable { 
        dest.writeLong(creationTime);

        dest.writeParcelable(mZenPolicy, 0);

        dest.writeInt(mModified ? ENABLED : DISABLED);

        dest.writeString(mPkg);

        dest.writeString8(mPkg);

    }



    @Override

core/java/android/app/INotificationManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ interface INotificationManager 
    void setNotificationPolicyAccessGranted(String pkg, boolean granted);

    void setNotificationPolicyAccessGrantedForUser(String pkg, int userId, boolean granted);

    AutomaticZenRule getAutomaticZenRule(String id);

    List<ZenModeConfig.ZenRule> getZenRules();

    ParceledListSlice<ZenModeConfig.ZenRule> getZenRules();

    String addAutomaticZenRule(in AutomaticZenRule automaticZenRule, String pkg);

    boolean updateAutomaticZenRule(String id, in AutomaticZenRule automaticZenRule);

    boolean removeAutomaticZenRule(String id);

core/java/android/app/NotificationManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1185,9 +1185,9 @@ public class NotificationManager { 
    public Map<String, AutomaticZenRule> getAutomaticZenRules() {

        INotificationManager service = getService();

        try {

            List<ZenModeConfig.ZenRule> rules = service.getZenRules();

            ParceledListSlice<ZenModeConfig.ZenRule> rules = service.getZenRules();

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

            for (ZenModeConfig.ZenRule rule : rules) {

            for (ZenModeConfig.ZenRule rule : rules.getList()) {

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

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

                        zenModeToInterruptionFilter(rule.zenMode), rule.enabled,