From ad1b6b7520cf4659c463b1beea24cc0b530f2795 Mon Sep 17 00:00:00 2001 From: Victor Hsieh Date: Tue, 25 Jul 2023 17:15:21 -0700 Subject: [PATCH] Use Java 17's "record" to simplify the data class Bug: None Test: atest BinaryTransparencyHostTest BinaryTransparencyServiceTest Change-Id: I20398b5a4a163e02cc4f3b3b6fc5d06eb8d58dc9 --- .../server/BinaryTransparencyService.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/services/core/java/com/android/server/BinaryTransparencyService.java b/services/core/java/com/android/server/BinaryTransparencyService.java index 8fc30e43d1a0b..173a75be10b05 100644 --- a/services/core/java/com/android/server/BinaryTransparencyService.java +++ b/services/core/java/com/android/server/BinaryTransparencyService.java @@ -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) {} }