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

Merge "Use Java 17's "record" to simplify the data class" into main

Browse Source
This commit is contained in:
Victor Hsieh
2023-07-26 16:22:46 +00:00
committed by Android (Google) Code Review
parent bdee2a6b95 ad1b6b7520
commit 89ab12e991
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/BinaryTransparencyService.java
View File

@@ -229,8 +229,8 @@ public class BinaryTransparencyService extends SystemService {
// Only digest and split name are different between splits.
Digest digest = measureApk(split.getPath());
appInfo.digest = digest.value;
appInfo.digestAlgorithm = digest.algorithm;
appInfo.digest = digest.value();
appInfo.digestAlgorithm = digest.algorithm();
results.add(appInfo);
}
@@ -391,8 +391,8 @@ public class BinaryTransparencyService extends SystemService {
var apexInfo = new IBinaryTransparencyService.ApexInfo();
apexInfo.packageName = packageState.getPackageName();
apexInfo.longVersion = packageState.getVersionCode();
apexInfo.digest = apexChecksum.value;
apexInfo.digestAlgorithm = apexChecksum.algorithm;
apexInfo.digest = apexChecksum.value();
apexInfo.digestAlgorithm = apexChecksum.algorithm();
apexInfo.signerDigests =
computePackageSignerSha256Digests(packageState.getSigningInfo());
@@ -1693,13 +1693,5 @@ public class BinaryTransparencyService extends SystemService {
return slice.getList();
}
private static class Digest {
public int algorithm;
public byte[] value;
Digest(int algorithm, byte[] value) {
this.algorithm = algorithm;
this.value = value;
}
}
private record Digest(int algorithm, byte[] value) {}
}