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

Commit 3e680260 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge \"fix resolver\" into nyc-mr1-dev am: acc21f57" into nyc-mr1-dev-plus-aosp

parents dad8876d fcb12121

core/java/android/content/pm/EphemeralResolveInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import java.security.MessageDigest; 
import java.security.NoSuchAlgorithmException;

import java.util.ArrayList;

import java.util.List;

import java.util.Locale;



/**

 * Information about an ephemeral application.
@@ -152,7 +153,7 @@ public final class EphemeralResolveInfo implements Parcelable { 
        private static byte[][] generateDigest(Uri uri, int maxDigests) {

            ArrayList<byte[]> digests = new ArrayList<>();

            try {

                final String host = uri.getHost();

                final String host = uri.getHost().toLowerCase(Locale.ENGLISH);

                final MessageDigest digest = MessageDigest.getInstance(SHA_ALGORITHM);

                if (maxDigests <= 0) {

                    final byte[] hostBytes = host.getBytes();

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ public class PackageManagerService extends IPackageManager.Stub { 














    private static final String VENDOR_OVERLAY_DIR = "/vendor/overlay";



























    private static int DEFAULT_EPHEMERAL_HASH_PREFIX_MASK = 0xFFFFFFFF;













    private static int DEFAULT_EPHEMERAL_HASH_PREFIX_MASK = 0xFFFFF000;















    private static int DEFAULT_EPHEMERAL_HASH_PREFIX_COUNT = 5;





























    /** Permission grant: not grant the permission. */










@@ -5018,7 +5018,7 @@ public class PackageManagerService extends IPackageManager.Stub {













        }





























        // Go in reverse order so we match the narrowest scope first.













        for (int i = shaPrefix.length; i >= 0 ; --i) {













        for (int i = shaPrefix.length - 1; i >= 0 ; --i) {















            for (EphemeralResolveInfo ephemeralApplication : ephemeralResolveInfoList) {















                if (!Arrays.equals(digestBytes[i], ephemeralApplication.getDigestBytes())) {















                    continue;