commit 2234fc669b6bd32d5cc0fda67fbab53483e41570
author Michael Butler <butlermichael@google.com> Tue Apr 02 16:38:54 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 02 16:38:54 2019 -0700
tree 3112b9c099fcbdb91995c55bdbd81a34d6aac679
parent 139f8bd94218c0da63760989e700f65f6be36981
parent 12b4bc76343a18d587a4651b3bf4d909f7201819

NNAPI Burst object cleanup -- VTS update am: 60a2253bfb
am: 12b4bc7634

Change-Id: I6cdec360636481d02525ff04257ca2ce70eb88f5

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp

diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp
index 106f332..9c9779a 100644
--- a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp
+++ b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp
@@ -127,7 +127,7 @@
 }
 static std::unique_ptr<::android::nn::ExecutionBurstController> CreateBurst(
         const sp<V1_2::IPreparedModel>& preparedModel) {
-    return ::android::nn::createExecutionBurstController(preparedModel, /*blocking=*/true);
+    return ::android::nn::ExecutionBurstController::create(preparedModel, /*blocking=*/true);
 }
 enum class Executor { ASYNC, SYNC, BURST };
 enum class OutputType { FULLY_SPECIFIED, UNSPECIFIED, INSUFFICIENT };

neuralnetworks/1.2/vts/functional/ValidateRequest.cpp

diff --git a/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp b/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp
index b15f657..09e26cc 100644
--- a/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp
+++ b/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp
@@ -156,7 +156,7 @@
 
         // create burst
         std::unique_ptr<::android::nn::ExecutionBurstController> burst =
-                ::android::nn::createExecutionBurstController(preparedModel, /*blocking=*/true);
+                ::android::nn::ExecutionBurstController::create(preparedModel, /*blocking=*/true);
         ASSERT_NE(nullptr, burst.get());
 
         // create memory keys