Merge changes I1cd258e3,Ibe0fc535

* changes:
  Document NNAPI extensions
  Add a test Fibonacci extension

1 files changed, 6 insertions, 1 deletions

diff --git a/nn/runtime/test/TestExtensions.cpp b/nn/runtime/test/TestExtensions.cpp
index bd182311e..10b305e2c 100644
--- a/nn/runtime/test/TestExtensions.cpp
+++ b/nn/runtime/test/TestExtensions.cpp
@@ -69,11 +69,16 @@ class ExtensionsTest : public ::testing::Test {
         }
 
         DeviceManager::get()->forTest_registerDevice(kTestDriverName, new TestDriver());
+        // Discover extensions provided by registered devices.
+        TypeManager::get()->forTest_reset();
         mDevice = getDeviceByName(kTestDriverName);
         ASSERT_NE(mDevice, nullptr);
     }
 
-    virtual void TearDown() { DeviceManager::get()->forTest_reInitializeDeviceList(); }
+    virtual void TearDown() {
+        DeviceManager::get()->forTest_reInitializeDeviceList();
+        TypeManager::get()->forTest_reset();
+    }
 
     ANeuralNetworksDevice* getDeviceByName(const std::string& name) {
         ANeuralNetworksDevice* result = nullptr;