commit cd1bd11b87a04a1ba4c2427748a403784da575ad
author Yifan Hong <elsk@google.com> Wed Mar 22 01:47:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 22 01:47:35 2017 +0000
tree f33dbb3b3efbc5180348d9a62ee5438b3e0e5a1c
parent 68bed71673140cfa61e267b84a0688e5b6a5015c
parent 2cd07a7e6c62e183a0e01e8d5e789fd0597305d1

Merge changes from topic 'taskrunner_details' am: f11ca98fa0 am: aac2688822
am: 2cd07a7e6c

Change-Id: I81c88850958987dfbf0b51860af447f42cc09b63

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>