Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 0f8427773e

Change-Id: I4614c85ce7e08bbd5d30d8cebc3a77294154a577
This commit is contained in:
Todd Kennedy
2016-06-10 16:08:47 +00:00
committed by android-build-merger
parent 26f4966b19 0f8427773e
commit db6cd50708
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/content/pm/EphemeralResolveInfo.java
View File

@@ -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;
}

8
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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) {