From 4ffd6b6152ec4a7de10de58c56cb4fc36e4b8ba7 Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Thu, 14 Nov 2019 08:05:57 -0700 Subject: [PATCH] Add hashes for Keymaster 4.1 KM4.1 is actually landing in AOSP, but it creates a merge conflict. This is to deconflict the merge. Test: N/A Change-Id: If0705662121c91f7f4a5753bba9e2f9a07890686 --- current.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/current.txt b/current.txt index b81aca2cf6..dc2e6b07f1 100644 --- a/current.txt +++ b/current.txt @@ -594,6 +594,9 @@ f18695dd36ee205640b8326a17453858a7b4596653aaa6ef0016b0aef1bd4dac android.hardwar ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardware.health@2.1::IHealth 26f04510a0b57aba5167c5c0a7c2f077c2acbb98b81902a072517829fd9fd67f android.hardware.health@2.1::IHealthInfoCallback db47f4ceceb1f06c656f39caa70c557b0f8471ef59fd58611bea667ffca20101 android.hardware.health@2.1::types +c228aaa27f66c48e147159a4f4996c5273191fece1b08de31bd171c61334855e android.hardware.keymaster@4.1::IKeymasterDevice +adb0efdf1462e9b2e742c0dcadd598666aac551f178be06e755bfcdf5797abd0 android.hardware.keymaster@4.1::IOperation +7a04ea5595ed418ca3e91c28b8bd7353dd988be9be7b0c8c9e64fb4b77bd4523 android.hardware.keymaster@4.1::types 9e59fffceed0dd72a9799e04505db5f777bbbea1af0695ba4107ef6d967c6fda android.hardware.neuralnetworks@1.3::IDevice 4a6c3b3556da951b4def21ba579a227c022980fe4465df6cdfbe20628fa75f5a android.hardware.neuralnetworks@1.3::IPreparedModel 94e803236398bed1febb11cc21051bc42ec003700139b099d6c479e02a7ca3c3 android.hardware.neuralnetworks@1.3::IPreparedModelCallback