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

Commit 50a1bc27 authored by Michael Butler's avatar Michael Butler Committed by Automerger Merge Worker
Browse files

Merge "Remove NN canonical IDevice::isUpdatable -- hal" am: 15449890 am:... 

Merge "Remove NN canonical IDevice::isUpdatable -- hal" am: 15449890 am: 41c1b4d1 am: 8408cb69

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1677691

Change-Id: Icb61bef369b52733edf11e120264216dd2365d25
parents 11f8ba8b 8408cb69

neuralnetworks/1.0/utils/include/nnapi/hal/1.0/Device.h

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ class Device final : public nn::IDevice { 
    const std::string& getVersionString() const override;

    nn::Version getFeatureLevel() const override;

    nn::DeviceType getType() const override;

    bool isUpdatable() const override;

    const std::vector<nn::Extension>& getSupportedExtensions() const override;

    const nn::Capabilities& getCapabilities() const override;

    std::pair<uint32_t, uint32_t> getNumberOfCacheFilesNeeded() const override;

neuralnetworks/1.0/utils/src/Device.cpp

+0 −4
Original line number Diff line number Diff line
@@ -106,10 +106,6 @@ nn::DeviceType Device::getType() const { 
    return nn::DeviceType::OTHER;

}



bool Device::isUpdatable() const {

    return false;

}



const std::vector<nn::Extension>& Device::getSupportedExtensions() const {

    return kExtensions;

}

neuralnetworks/1.1/utils/include/nnapi/hal/1.1/Device.h

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ class Device final : public nn::IDevice { 
    const std::string& getVersionString() const override;

    nn::Version getFeatureLevel() const override;

    nn::DeviceType getType() const override;

    bool isUpdatable() const override;

    const std::vector<nn::Extension>& getSupportedExtensions() const override;

    const nn::Capabilities& getCapabilities() const override;

    std::pair<uint32_t, uint32_t> getNumberOfCacheFilesNeeded() const override;

neuralnetworks/1.1/utils/src/Device.cpp

+0 −4
Original line number Diff line number Diff line
@@ -106,10 +106,6 @@ nn::DeviceType Device::getType() const { 
    return nn::DeviceType::UNKNOWN;

}



bool Device::isUpdatable() const {

    return false;

}



const std::vector<nn::Extension>& Device::getSupportedExtensions() const {

    return kExtensions;

}

neuralnetworks/1.2/utils/include/nnapi/hal/1.2/Device.h

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ class Device final : public nn::IDevice { 
    const std::string& getVersionString() const override;

    nn::Version getFeatureLevel() const override;

    nn::DeviceType getType() const override;

    bool isUpdatable() const override;

    const std::vector<nn::Extension>& getSupportedExtensions() const override;

    const nn::Capabilities& getCapabilities() const override;

    std::pair<uint32_t, uint32_t> getNumberOfCacheFilesNeeded() const override;