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

Commit 0260d7d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix delivery of earlyBootEnded to KM4.1" into rvc-dev

parents acf79bfa 08c7e712

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();