diff options
| author | 2021-01-20 18:56:22 +0000 | |
|---|---|---|
| committer | 2021-01-20 18:56:22 +0000 | |
| commit | a4659cc4fec6248f310a5e08037b0aed2077eec5 (patch) | |
| tree | 1dc698a7b09310c03faeb73f14d96a82326189d3 /keystore/java | |
| parent | 57683e8918d089ee7ff7301c02537f690930cc4f (diff) | |
| parent | 7108d008dbf77e5067b38a18470a7e96b0920fba (diff) | |
Merge "Keystore 2.0 SPI: Use Timestamp from secure clock service" am: f327ea256c am: 5e27a324ac am: 7108d008db
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538990
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I574f5752b3b6e3aabad3305084048ff08c6dd63a
Diffstat (limited to 'keystore/java')
| -rw-r--r-- | keystore/java/android/security/AuthTokenUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/java/android/security/AuthTokenUtils.java b/keystore/java/android/security/AuthTokenUtils.java index 14d6626e5e97..e6376000673b 100644 --- a/keystore/java/android/security/AuthTokenUtils.java +++ b/keystore/java/android/security/AuthTokenUtils.java @@ -18,7 +18,7 @@ package android.security; import android.annotation.NonNull; import android.hardware.security.keymint.HardwareAuthToken; -import android.hardware.security.keymint.Timestamp; +import android.hardware.security.secureclock.Timestamp; import java.nio.ByteBuffer; import java.nio.ByteOrder; |