| commit | e95cec536369c02ce8d6524b09eb017226e0621a | [log] [tgz] |
|---|---|---|
| author | Shunkai Yao <yaoshunkai@google.com> | Tue Dec 03 17:45:18 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Dec 03 17:45:18 2024 +0000 |
| tree | d84f2bc06314a56fcfc1e3cdbf44c35a62bf527e | |
| parent | 4c5ab8db99ab10622b1ac34eaa1ae01b259fd02d [diff] | |
| parent | 922576ff7e41acf0b41eece802587c4760060bb7 [diff] |
Merge "Add audio eraser effect AIDL and placeholder implementation" into main
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, } /*