| commit | 4c33fecf8dbacbb2d28bb9da9f58e889b91364eb | [log] [tgz] |
|---|---|---|
| author | Orlando Arbildo <oarbildo@google.com> | Tue Dec 03 17:47:17 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 03 17:47:17 2024 +0000 |
| tree | 8ffc47bb369721e5fcaf05f7a1aa0c065f87ae8c | |
| parent | 7668a201b82d8554fbf52d0433d42644aba4c578 [diff] | |
| parent | 4c5ab8db99ab10622b1ac34eaa1ae01b259fd02d [diff] |
Merge "hwcrypto: Removing batch key definition" into main am: 4c5ab8db99 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3387952 Change-Id: I28850bfd733b1ec9e7b37a62c09d392f0476f0a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see.hwcrypto/current/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl b/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see.hwcrypto/current/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl index 83b8496..b31a06c 100644 --- a/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see.hwcrypto/current/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl +++ b/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see.hwcrypto/current/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl
@@ -44,7 +44,6 @@ android.hardware.security.see.hwcrypto.IOpaqueKey getKeyslotData(android.hardware.security.see.hwcrypto.IHwCryptoKey.KeySlot slotId); enum DeviceKeyId { DEVICE_BOUND_KEY, - BATCH_KEY, } enum KeySlot { KEYMINT_SHARED_HMAC_KEY,
diff --git a/security/see/hwcrypto/aidl/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl b/security/see/hwcrypto/aidl/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl index 44ec32f..97a4c37 100644 --- a/security/see/hwcrypto/aidl/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl +++ b/security/see/hwcrypto/aidl/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl
@@ -35,10 +35,6 @@ * This is a key unique to the device. */ DEVICE_BOUND_KEY, - /* - * This is a shared by a set of devices. - */ - BATCH_KEY, } /*