diff options
| author | Orion Hodson <oth@google.com> | 2020-12-11 10:45:43 +0000 |
|---|---|---|
| committer | Orion Hodson <oth@google.com> | 2020-12-11 10:45:43 +0000 |
| commit | 6acd9c63e7bfbd3f4c18bd1ca5b559fffe44fe5e (patch) | |
| tree | 83aa9b3500d365f4e6a6e7d0d47c1abff781ef35 /keystore/java/android/security/KeyStoreOperation.java | |
| parent | 8954dfa0924b15557f5346986ef9aa98f2537a5e (diff) | |
Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."
Revert "Keystore 2.0: Move keymint spec to security namespace."
Revert "Keystore 2.0: Move keymint spec to security namespace."
Revert "Move keymint to android.hardware.security."
Revert "Configure CF to start KeyMint service by default."
Revert "Move keymint to android.hardware.security."
Revert "Move keymint to android.hardware.security."
Revert submission 1522123-move_keymint
Reason for revert: Build breakage
Bug: 175345910
Bug: 171429297
Reverted Changes:
Ief0e9884a:Keystore 2.0: Move keymint spec to security namesp...
Idb54e8846:Keystore 2.0: Move keymint spec to security namesp...
I9f70db0e4:Remove references to keymint1
I2b4ce3349:Keystore 2.0 SPI: Move keymint spec to security na...
I2498073aa:Move keymint to android.hardware.security.
I098711e7d:Move keymint to android.hardware.security.
I3ec8d70fe:Configure CF to start KeyMint service by default.
Icbb373c50:Move keymint to android.hardware.security.
I86bccf40e:Move keymint to android.hardware.security.
Change-Id: Icd279f358db2387bf2bf232b0548762fab51e67d
Diffstat (limited to 'keystore/java/android/security/KeyStoreOperation.java')
| -rw-r--r-- | keystore/java/android/security/KeyStoreOperation.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyStoreOperation.java b/keystore/java/android/security/KeyStoreOperation.java index 7ea9e1438845..49a48871fd30 100644 --- a/keystore/java/android/security/KeyStoreOperation.java +++ b/keystore/java/android/security/KeyStoreOperation.java @@ -17,7 +17,7 @@ package android.security; import android.annotation.NonNull; -import android.hardware.security.keymint.KeyParameter; +import android.hardware.keymint.KeyParameter; import android.os.RemoteException; import android.os.ServiceSpecificException; import android.security.keymaster.KeymasterDefs; |