commit b1ae421a2ef25ce2eec3fea7fa2449eeac9238b0
author Steven Moreland <smoreland@google.com> Mon Mar 27 17:37:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 27 17:37:35 2017 +0000
tree eb503d94ee988e128cf7c7675601f67e1cc5fb34
parent 04d9db7bd09ef2e0ed7209c47b5d7dc63ec55522
parent d25e12faeec5b5319feaac50d3434a71b5814918

Revert "Revert "Wait for hwservicemanager in defaultServiceManager."" am: c1cee2ca2b am: be822c8ff8
am: d25e12faee

Change-Id: Id95dc92594aa6ad1cab1c24d43dbc0689cb73c56

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>