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

Merge "BinaryTransparencyService: Log new atom to Westworld."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-12-01 16:45:01 +00:00
committed by Android (Google) Code Review
parent 45d095b838 0000111139
commit 916368dfc4
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -310,27 +310,27 @@ public class BinaryTransparencyService extends SystemService {
Bundle packageMeasurement = measurePackage(packageInfo);
results.add(packageMeasurement);
if (record) {
if (record && (mba_status == MBA_STATUS_UPDATED_PRELOAD)) {
// compute digests of signing info
String[] signerDigestHexStrings = computePackageSignerSha256Digests(
packageInfo.signingInfo);
// now we should have all the bits for the atom
/* TODO: Uncomment and test after merging new atom definition.
byte[] cDigest = packageMeasurement.getByteArray(BUNDLE_CONTENT_DIGEST);
FrameworkStatsLog.write(FrameworkStatsLog.MOBILE_BUNDLED_APP_INFO_GATHERED,
packageInfo.packageName,
packageInfo.getLongVersionCode(),
HexEncoding.encodeToString(packageMeasurement.getByteArray(
BUNDLE_CONTENT_DIGEST), false),
(cDigest != null) ? HexEncoding.encodeToString(
packageMeasurement.getByteArray(BUNDLE_CONTENT_DIGEST),
false) : null,
packageMeasurement.getInt(BUNDLE_CONTENT_DIGEST_ALGORITHM),
signerDigestHexStrings, // signer_cert_digest
mba_status, // mba_status
mba_status, // mba_status
null, // initiator
null, // initiator_signer_digest
null, // installer
null // originator
);
*/
}
}
if (DEBUG) {
@@ -377,12 +377,13 @@ public class BinaryTransparencyService extends SystemService {
}
// we should now have all the info needed for the atom
/* TODO: Uncomment and test after merging new atom definition.
byte[] cDigest = packageMeasurement.getByteArray(BUNDLE_CONTENT_DIGEST);
FrameworkStatsLog.write(FrameworkStatsLog.MOBILE_BUNDLED_APP_INFO_GATHERED,
packageInfo.packageName,
packageInfo.getLongVersionCode(),
HexEncoding.encodeToString(packageMeasurement.getByteArray(
BUNDLE_CONTENT_DIGEST), false),
(cDigest != null) ? HexEncoding.encodeToString(
packageMeasurement.getByteArray(BUNDLE_CONTENT_DIGEST),
false) : null,
packageMeasurement.getInt(BUNDLE_CONTENT_DIGEST_ALGORITHM),
signerDigestHexStrings,
MBA_STATUS_NEW_INSTALL, // mba_status
@@ -391,7 +392,6 @@ public class BinaryTransparencyService extends SystemService {
installer,
originator
);
*/
}
}
if (DEBUG) {