appsecurity: update to use SigningInfo-based API.
The PackageInfo field exposed via GET_SIGNING_CERTIFICATES has been
changed, so the API tests checking that it provides the proper info
also need to be changed.
Bug: 74831530
Test: PkgInstallSignatureVerificationTest
Change-Id: I86842947c8a560f9818b2e4edce909dcdbf47869
diff --git a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/src/android/appsecurity/cts/v3rotationtests/V3RotationTest.java b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/src/android/appsecurity/cts/v3rotationtests/V3RotationTest.java
index e13dfad..4fe98ec 100644
--- a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/src/android/appsecurity/cts/v3rotationtests/V3RotationTest.java
+++ b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/src/android/appsecurity/cts/v3rotationtests/V3RotationTest.java
@@ -18,6 +18,7 @@
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
+import android.content.pm.Signature;
import android.util.Log;
import android.test.AndroidTestCase;
@@ -115,20 +116,19 @@
PackageManager pm = getContext().getPackageManager();
PackageInfo pi = pm.getPackageInfo(PKG, PackageManager.GET_SIGNING_CERTIFICATES);
assertNotNull("Failed to get signatures in PackageInfo of " + PKG,
- pi.signingCertificateHistory);
- int numSigningSets = pi.signingCertificateHistory.length;
+ pi.signingInfo);
+ assertFalse("Multiple signing certificates found in signing certificate history for " + PKG,
+ pi.signingInfo.hasMultipleSigners());
+ Signature[] signingHistory = pi.signingInfo.getSigningCertificateHistory();
+ int numSigningSets = signingHistory.length;
assertEquals("PackageInfo for " + PKG + "contains the wrong number of signing certificat "
+ " rotations. Expected 2 (corresponding to one rotation). Found: "
- + numSigningSets, 2, pi.signingCertificateHistory.length);
-
- // make sure all entries have at most one signing certificate. Also check to see if we
- // match the certs for which we're looking
+ + numSigningSets, 2, numSigningSets);
+ // check to see if we match the certs for which we're looking
boolean matchedFirst = false;
boolean matchedSecond = false;
- for (int i = 0; i < numSigningSets; i ++) {
- assertEquals("Multiple signing certificates found in signing certificate history for "
- + PKG, 1, pi.signingCertificateHistory[i].length);
- String reportedCert = pi.signingCertificateHistory[i][0].toCharsString();
+ for (int i = 0; i < numSigningSets; i++) {
+ String reportedCert = signingHistory[i].toCharsString();
if (FIRST_CERT_HEX.equals(reportedCert)) {
matchedFirst = true;
} else if (SECOND_CERT_HEX.equals(reportedCert)) {