From 08c7e7123641efcef65398bf1d16bd368c5fb14a Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Tue, 14 Apr 2020 21:48:11 -0600 Subject: [PATCH] Fix delivery of earlyBootEnded to KM4.1 Bug: 152932559 Test: Boot and observe that Strongbox gets the message Change-Id: I752b44f5cc20d85bf819188ccaaf0813a5607ba5 --- keymaster/4.1/support/include/keymasterV4_1/Keymaster4.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/keymaster/4.1/support/include/keymasterV4_1/Keymaster4.h b/keymaster/4.1/support/include/keymasterV4_1/Keymaster4.h index 75d9139e83..f4957961b4 100644 --- a/keymaster/4.1/support/include/keymasterV4_1/Keymaster4.h +++ b/keymaster/4.1/support/include/keymasterV4_1/Keymaster4.h @@ -31,17 +31,11 @@ class Keymaster4 : public Keymaster { // enumerate 4.1. devices. using WrappedIKeymasterDevice = V4_0::IKeymasterDevice; - Keymaster4(sp km4_1_dev, const hidl_string& instanceName) - : Keymaster(V4_1::IKeymasterDevice::descriptor, instanceName), - haveVersion_(false), - km4_0_dev_(km4_1_dev), - km4_1_dev_(km4_1_dev) {} - Keymaster4(sp km4_0_dev, const hidl_string& instanceName) : Keymaster(V4_1::IKeymasterDevice::descriptor, instanceName), haveVersion_(false), km4_0_dev_(km4_0_dev), - km4_1_dev_() {} + km4_1_dev_(V4_1::IKeymasterDevice::castFrom(km4_0_dev)) {} const VersionResult& halVersion() const override { const_cast(this)->getVersionIfNeeded();