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

Commit db6cd507 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge \"fix prefix generation\" into nyc-mr1-dev 

am: 0f842777

Change-Id: I4614c85ce7e08bbd5d30d8cebc3a77294154a577
parents 26f4966b 0f842777

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

+4 −4
Original line number Diff line number Diff line
@@ -57,10 +57,10 @@ public final class EphemeralResolveInfo implements Parcelable { 


        mDigestBytes = generateDigest(uri);

        mDigestPrefix =

                mDigestBytes[0] << 24

                | mDigestBytes[1] << 16

                | mDigestBytes[2] << 8

                | mDigestBytes[3] << 0;

                (mDigestBytes[0] & 0xFF) << 24

                | (mDigestBytes[1] & 0xFF) << 16

                | (mDigestBytes[2] & 0xFF) << 8

                | (mDigestBytes[3] & 0xFF) << 0;

        mFilters.addAll(filters);

        mPackageName = packageName;

    }

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

+4 −4
Original line number Diff line number Diff line
@@ -5006,10 +5006,10 @@ public class PackageManagerService extends IPackageManager.Stub { 
        final byte[] hostBytes = intent.getData().getHost().getBytes();

        final byte[] digestBytes = digest.digest(hostBytes);

        int shaPrefix =

                digestBytes[0] << 24

                | digestBytes[1] << 16

                | digestBytes[2] << 8

                | digestBytes[3] << 0;

                (digestBytes[0] & 0xFF) << 24

                | (digestBytes[1] & 0xFF) << 16

                | (digestBytes[2] & 0xFF) << 8

                | (digestBytes[3] & 0xFF) << 0;

        final List<EphemeralResolveInfo> ephemeralResolveInfoList =

                mEphemeralResolverConnection.getEphemeralResolveInfoList(shaPrefix);

        if (ephemeralResolveInfoList == null || ephemeralResolveInfoList.size() == 0) {