commit 25d8e8714c120716b2982790818dad502693e2f4
author Michael Butler <butlermichael@google.com> Tue Dec 19 11:59:54 2017 -0800
committer Michael Butler <butlermichael@google.com> Thu Dec 21 12:02:06 2017 -0800
tree 5f523b59135f994630e0949bc17b6e34ce38bb31
parent 9001cd5bf64977f6f61112a37052a03c87ee9550

Integrate with 12/07 drop

Bug: 67478959
Test: mm, test vts and cts binaries
Change-Id: I4245170cf8ff5bb3c017354dbce9930c3e7c8574

1.0/Device.cpp

diff --git a/1.0/Device.cpp b/1.0/Device.cpp
index c52a81b..264223b 100644
--- a/1.0/Device.cpp
+++ b/1.0/Device.cpp
@@ -88,7 +88,7 @@
     return Void();
 }
 
-void Device::asyncPrepare(const Model& model, const sp<IPreparedModelCallback>& callback) {
+static void asyncPrepare(const Model& model, const sp<IPreparedModelCallback>& callback) {
     std::shared_ptr<hexagon::Model> hexagonModel = std::make_shared<hexagon::Model>(model);
 
     Return<void> ret;