commit 154e208b031911e665fdea91f303a7363df2b8f9
author Steven Moreland <smoreland@google.com> Mon Mar 27 18:47:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 27 18:47:24 2017 +0000
tree 605596ffc6ebcb1b2629f7197b5ab773afcdf82b
parent 0855a64e1eb3674da1282d6e91f2199af2fade81
parent d79a4c663d6b79060ed0a514242c11842e1ec2c8

Merge "std::string from const hidl_string test" am: dd92847469 am: d23de8bbf9
am: d79a4c663d

Change-Id: I220457527b29fce9d6758cc54e36168d873ebc17

base/HidlSupport.cpp

diff --git a/base/HidlSupport.cpp b/base/HidlSupport.cpp
index e97797d..91c9717 100644
--- a/base/HidlSupport.cpp
+++ b/base/HidlSupport.cpp
@@ -147,6 +147,7 @@
 }
 
 void hidl_handle::setTo(native_handle_t* handle, bool shouldOwn) {
+    freeHandle();
     mHandle = handle;
     mOwnsHandle = shouldOwn;
 }

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 3fe38e7..c4fd16f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -35,4 +35,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal>
+        <name>android.frameworks.sensorservice</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ISensorManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>