From 01e3b92c65df90215069fcba94a7b59187d61931 Mon Sep 17 00:00:00 2001 From: Victor Hsieh Date: Wed, 25 Jan 2023 16:10:37 -0800 Subject: [PATCH] Write with splitName in BinaryTransparencyService This is just for consistency with the atom change, for now. Bug: 264296226 Test: TODO Change-Id: I47f39cb4a2c7bb522ab7c80aff1f2986bc040563 --- .../com/android/internal/os/IBinaryTransparencyService.aidl | 1 + .../java/com/android/server/BinaryTransparencyService.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/os/IBinaryTransparencyService.aidl b/core/java/com/android/internal/os/IBinaryTransparencyService.aidl index b4a0aac4d477b..ca7b83ed44f54 100644 --- a/core/java/com/android/internal/os/IBinaryTransparencyService.aidl +++ b/core/java/com/android/internal/os/IBinaryTransparencyService.aidl @@ -41,6 +41,7 @@ interface IBinaryTransparencyService { parcelable AppInfo { String packageName; long longVersion; + String splitName; byte[] digest; int digestAlgorithm; String[] signerDigests; diff --git a/services/core/java/com/android/server/BinaryTransparencyService.java b/services/core/java/com/android/server/BinaryTransparencyService.java index ecc303f226c4f..e076fba0657cc 100644 --- a/services/core/java/com/android/server/BinaryTransparencyService.java +++ b/services/core/java/com/android/server/BinaryTransparencyService.java @@ -405,6 +405,7 @@ public class BinaryTransparencyService extends SystemService { } private void recordApexInfo(IBinaryTransparencyService.ApexInfo apexInfo) { + // Must order by the proto's field number. FrameworkStatsLog.write(FrameworkStatsLog.APEX_INFO_GATHERED, apexInfo.packageName, apexInfo.longVersion, @@ -415,6 +416,7 @@ public class BinaryTransparencyService extends SystemService { } private void writeAppInfoToLog(IBinaryTransparencyService.AppInfo appInfo) { + // Must order by the proto's field number. FrameworkStatsLog.write(FrameworkStatsLog.MOBILE_BUNDLED_APP_INFO_GATHERED, appInfo.packageName, appInfo.longVersion, @@ -426,7 +428,8 @@ public class BinaryTransparencyService extends SystemService { appInfo.initiator, appInfo.initiatorSignerDigests, appInfo.installer, - appInfo.originator); + appInfo.originator, + appInfo.splitName); } /**