commit 3045d7d95116b5add51b4514c40f1a1650e40ec2
author David Drysdale <drysdale@google.com> Mon Dec 02 11:10:57 2024 +0000
committer David Drysdale <drysdale@google.com> Tue Dec 03 18:41:54 2024 +0000
tree 51c5f4ed75b9ffa7aa89d17999bc601bc468cfdd
parent 1bf8d3aa9e9ad83cf5ea9e2ec60389f0dc34b1a1

Fix compile error in different build variant

- aosp/3341662 didn't get merged to internal main
- ag/30674610 fixed that but needed a change so it compiles in all
  configs
- this CL applies the same change to AOSP, but with a merged-in stanza
  to prevent downstream conflicts

Bug: 369375199
Test: treehugger
Flag: android.security.keystore2.Flags.FLAG_ATTEST_MODULES
Merged-In: I7195aaca849eb53e603565a470b780ba91b3ec2c
Change-Id: I58f3c9a17894123d5536c0d556e2d1eb5ce90888

keystore/java/android/security/KeyStore2HalLatest.java

diff --git a/keystore/java/android/security/KeyStore2HalLatest.java b/keystore/java/android/security/KeyStore2HalLatest.java
index b6e1cbb..123f1c0 100644
--- a/keystore/java/android/security/KeyStore2HalLatest.java
+++ b/keystore/java/android/security/KeyStore2HalLatest.java
@@ -23,7 +23,7 @@
 * and KeyMint (V4) are used.
 */
 class KeyStore2HalVersion {
-    public byte[] getSupplementaryAttestationInfoHelper(int tag, KeyStore2 ks)
+    public static byte[] getSupplementaryAttestationInfoHelper(int tag, KeyStore2 ks)
             throws KeyStoreException {
         return ks.handleRemoteExceptionWithRetry(
             (service) -> service.getSupplementaryAttestationInfo(tag));