commit a1a91eae0292701dc60c4017e4871cd5f5dba7dd
author Treehugger Robot <treehugger-gerrit@google.com> Tue Feb 26 02:25:13 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 26 02:25:13 2019 +0000
tree 1e60a27f3bd89d2fa30080488c4fca580ec7356d
parent f0896f59be8e7640819e9c2063f0fa8a43967b77
parent 6f9074a8e1bfbb65b8f7199cdc1b0be28aa9ad04

Merge "MemoryDealer: Avoid using invalid iterator"

Android.bp

diff --git a/Android.bp b/Android.bp
index b78845c..97ed108 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,6 +27,7 @@
     defaults: ["libhidl-defaults"],
     gtest: false,
     srcs: ["test_main.cpp"],
+    test_suites: ["device-tests"],
 
     shared_libs: [
         "android.hidl.memory@1.0",

base/include/hidl/HidlSupport.h

diff --git a/base/include/hidl/HidlSupport.h b/base/include/hidl/HidlSupport.h
index 55f21ea..98b37ab 100644
--- a/base/include/hidl/HidlSupport.h
+++ b/base/include/hidl/HidlSupport.h
@@ -334,7 +334,7 @@
     }
 
     // Note, does not initialize primitive types.
-    hidl_vec(size_t size) : hidl_vec() { resize(size); }
+    explicit hidl_vec(size_t size) : hidl_vec() { resize(size); }
 
     hidl_vec(const hidl_vec<T> &other) : hidl_vec() {
         *this = other;