diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-12 00:49:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-12 00:49:56 +0000 |
| commit | cf7203f5d36fdcd81a205dc48c67d144d1334508 (patch) | |
| tree | d57e5c5e15181c89fa2704e9d01a84930c6b02bf /core/java/android | |
| parent | 3ccb1123540959a13ceb2eb62845bad17febd4c6 (diff) | |
| parent | 4ac4916c8d3dde9542fb51c755041de4bb65fe62 (diff) | |
Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe am: 4ac4916c8d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525189
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I063cb954f1833c45debf25cb0b072706eb55d2c4
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index 6ef9e7e3d9b8..017f40521a81 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -16,18 +16,18 @@ package android.security.keymaster; -import android.hardware.keymint.Algorithm; -import android.hardware.keymint.BlockMode; -import android.hardware.keymint.Digest; -import android.hardware.keymint.ErrorCode; -import android.hardware.keymint.HardwareAuthenticatorType; -import android.hardware.keymint.KeyFormat; -import android.hardware.keymint.KeyOrigin; -import android.hardware.keymint.KeyPurpose; -import android.hardware.keymint.PaddingMode; -import android.hardware.keymint.SecurityLevel; -import android.hardware.keymint.Tag; -import android.hardware.keymint.TagType; +import android.hardware.security.keymint.Algorithm; +import android.hardware.security.keymint.BlockMode; +import android.hardware.security.keymint.Digest; +import android.hardware.security.keymint.ErrorCode; +import android.hardware.security.keymint.HardwareAuthenticatorType; +import android.hardware.security.keymint.KeyFormat; +import android.hardware.security.keymint.KeyOrigin; +import android.hardware.security.keymint.KeyPurpose; +import android.hardware.security.keymint.PaddingMode; +import android.hardware.security.keymint.SecurityLevel; +import android.hardware.security.keymint.Tag; +import android.hardware.security.keymint.TagType; import java.util.HashMap; import java.util.Map; |