Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b861b94 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix delivery of earlyBootEnded to KM4.1" into rvc-dev am: 0260d7d1 am: 0db26c9a 

Change-Id: I71f0f7fca349e84c4deb85ed7b2b92535c00a931
parents bf3bfa31 0db26c9a

keymaster/4.1/support/include/keymasterV4_1/Keymaster4.h

+1 −7
Original line number Diff line number Diff line
@@ -31,17 +31,11 @@ class Keymaster4 : public Keymaster { 
    // enumerate 4.1. devices.

    using WrappedIKeymasterDevice = V4_0::IKeymasterDevice;



    Keymaster4(sp<V4_1::IKeymasterDevice> 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<V4_0::IKeymasterDevice> 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<Keymaster4*>(this)->getVersionIfNeeded();