diff options
| author | 2024-02-05 20:44:40 +0000 | |
|---|---|---|
| committer | 2024-02-05 20:44:40 +0000 | |
| commit | c041995b0ced6e2e2b799d35cc50f737cbee4f48 (patch) | |
| tree | 7b97880604c4e393695db8cd046fc985e5112bd6 | |
| parent | 91f84a4bc042cd3b308f23e6c009777d83f7863b (diff) | |
| parent | c1b8da33ed6be61f2a065364199baaf2edf08104 (diff) | |
Merge "[ECM] Strip colons from sha256-cert-digest" into main
| -rw-r--r-- | services/core/java/com/android/server/SystemConfig.java | 2 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/SystemConfig.java b/services/core/java/com/android/server/SystemConfig.java index 797a2e6e5128..a341b4acaca1 100644 --- a/services/core/java/com/android/server/SystemConfig.java +++ b/services/core/java/com/android/server/SystemConfig.java @@ -1676,7 +1676,7 @@ public class SystemConfig { } byte[] certificateDigest = null; try { - certificateDigest = new Signature(certificateDigestStr).toByteArray(); + certificateDigest = new Signature(certificateDigestStr.replace(":", "")).toByteArray(); } catch (IllegalArgumentException e) { Slog.w(TAG, "<" + elementName + "> with invalid sha256-cert-digest in " + permFile + " at " + parser.getPositionDescription()); diff --git a/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java b/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java index 1c2dab867de2..eddff9abec21 100644 --- a/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java +++ b/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java @@ -39,7 +39,6 @@ import androidx.test.runner.AndroidJUnit4; import com.android.server.SystemConfig; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -711,14 +710,14 @@ public class SystemConfigTest { @Test @RequiresFlagsEnabled( android.permission.flags.Flags.FLAG_ENHANCED_CONFIRMATION_MODE_APIS_ENABLED) - @Ignore("b/323603510") public void getEnhancedConfirmationTrustedInstallers_returnsTrustedInstallers() throws IOException { String pkgName = "com.example.app"; String certificateDigestStr = "E9:7A:BC:2C:D1:CA:8D:58:6A:57:0B:8C:F8:60:AA:D2:" + "8D:13:30:2A:FB:C9:00:2C:5D:53:B2:6C:09:A4:85:A0"; - byte[] certificateDigest = new Signature(certificateDigestStr).toByteArray(); + byte[] certificateDigest = new Signature(certificateDigestStr.replace(":", "")) + .toByteArray(); String contents = "<config>" + "<" + "enhanced-confirmation-trusted-installer" + " " + "package=\"" + pkgName + "\"" |