commit d46434b577f5dd0b0f896e0ac95fca9e33711304
author Steven Moreland <smoreland@google.com> Wed Mar 22 17:19:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 22 17:19:44 2017 +0000
tree b5071aca70ee0a5e6056bff12c45d2229166e09e
parent cd1bd11b87a04a1ba4c2427748a403784da575ad
parent 63c16780002c0904ae0bd178b8047e5eeb449bcf

Merge "Fix inconsistent logging in registerReference." am: cda4a169a7 am: cd5fdcf35c
am: 63c1678000

Change-Id: Ia6679d9c6d7a60e6170ed725fbf6c1d75fb42556

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>