| commit | 182dee76e2de6a949cdc4c8f4b86475447afc909 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Nov 21 10:40:36 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 21 10:40:36 2017 +0000 |
| tree | 3199cfc83bb0af13316e50b0080e8abfcb47173f | |
| parent | f9c174415eb69ae432c24ba7e1e787a0bde4dd6c [diff] | |
| parent | ec44d18dbe693e86db9ac6e56ab08e415664be56 [diff] |
Merge "android.hardware.graphics.allocator@2.0 is no longer VNDK-SP"
diff --git a/usb/1.0/vts/functional/VtsHalUsbV1_0TargetTest.cpp b/usb/1.0/vts/functional/VtsHalUsbV1_0TargetTest.cpp index b77398f..e01b974 100644 --- a/usb/1.0/vts/functional/VtsHalUsbV1_0TargetTest.cpp +++ b/usb/1.0/vts/functional/VtsHalUsbV1_0TargetTest.cpp
@@ -160,7 +160,7 @@ // and the callback thread. std::mutex usb_mtx; std::condition_variable usb_cv; - int usb_count; + int usb_count = 0; }; /*
diff --git a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp index 0851cb2..313bdd8 100644 --- a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp +++ b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp
@@ -206,7 +206,5 @@ void stopWifi() { sp<IWifi> wifi = getWifi(); ASSERT_NE(wifi, nullptr); - const auto status = HIDL_INVOKE(wifi, stop); - ASSERT_TRUE((status.code == WifiStatusCode::SUCCESS) || - (status.code == WifiStatusCode::ERROR_NOT_AVAILABLE)); + HIDL_INVOKE(wifi, stop); }