summaryrefslogtreecommitdiff
path: root/keystore
diff options
context:
space:
mode:
author David Drysdale <drysdale@google.com> 2024-12-02 11:10:57 +0000
committer David Drysdale <drysdale@google.com> 2024-12-03 18:41:54 +0000
commit3045d7d95116b5add51b4514c40f1a1650e40ec2 (patch)
tree51c5f4ed75b9ffa7aa89d17999bc601bc468cfdd /keystore
parent1bf8d3aa9e9ad83cf5ea9e2ec60389f0dc34b1a1 (diff)
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
Diffstat (limited to 'keystore')
-rw-r--r--keystore/java/android/security/KeyStore2HalLatest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyStore2HalLatest.java b/keystore/java/android/security/KeyStore2HalLatest.java
index b6e1cbb4cbb6..123f1c0b8f39 100644
--- a/keystore/java/android/security/KeyStore2HalLatest.java
+++ b/keystore/java/android/security/KeyStore2HalLatest.java
@@ -23,7 +23,7 @@ package android.security;
* 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));