Commit: bb7ef971703f239e8440d2a009cd75597a6b60ba - system-hardware-interfaces-mnstshlylh (git)...

system/hardware/interfaces-mnstshlylh

Commit MetaInfo

• Revision: bb7ef971703f239e8440d2a009cd75597a6b60ba (tree)
• Time: 2019-04-19 08:12:00
• Author: Branden Archer <brarcher@goog...>
• Commiter: Branden Archer

Log Message

Access Wifi Keystore HAL via binder

The test originally linked against the HAL directly, as well as the
generated stub to access the HAL.. This "worked", however if both the
32-bit and 64-bit versions of the generated stub library were
not present the test would fail. It turned out that on AOSP builds
this was the case, as a 32-bit version of android.system.wifi.keystore
was not present as it was never used at runtime.

To avoid this issue, the stub is now linked statically. Further, the
HAL under test is accessed over binder.

Bug: 130207625
Test: On an AOSP build:

make vts;
vts-tradefed run commandAndExit vts -m VtsHalWifiKeystoreV1_0TargetTest

Change-Id: I02cac1e89c8bed45a4b9b98820c86500327891b6
Merged-In: I138f3e7809a337cec81dccbc52c7a9170acd1d3d

Change Summary

• modified: wifi/keystore/1.0/vts/functional/Android.bp
• modified: wifi/keystore/1.0/vts/functional/VtsHalWifiKeystoreV1_0TargetTest.cpp

Incremental Difference

--- a/wifi/keystore/1.0/vts/functional/Android.bp
+++ b/wifi/keystore/1.0/vts/functional/Android.bp
@@ -27,15 +27,18 @@ cc_test {
         "libhidltransport",
         "libnativehelper",
         "libutils",
-        "android.system.wifi.keystore@1.0",
-        "libwifikeystorehal",
         "libkeystore_binder",
         "libbinder",
         "libkeystore_aidl",
         "libkeystore_parcelables",
         "libkeymaster4support",
+        "libbinderthreadstate",
+        "libhwbinder",
+    ],
+    static_libs: [
+        "VtsHalHidlTargetTestBase",
+        "android.system.wifi.keystore@1.0",
     ],
-    static_libs: ["VtsHalHidlTargetTestBase"],
     cflags: [
         "-O0",
         "-g",

--- a/wifi/keystore/1.0/vts/functional/VtsHalWifiKeystoreV1_0TargetTest.cpp
+++ b/wifi/keystore/1.0/vts/functional/VtsHalWifiKeystoreV1_0TargetTest.cpp
@@ -17,12 +17,14 @@
 #include <android-base/logging.h>
 
 #include <VtsHalHidlTargetTestBase.h>
+#include <android/security/keystore/IKeystoreService.h>
+#include <android/system/wifi/keystore/1.0/IKeystore.h>
+#include <binder/IServiceManager.h>
 #include <binder/ProcessState.h>
 #include <keymasterV4_0/authorization_set.h>
 #include <keystore/keystore_promises.h>
 #include <private/android_filesystem_config.h>
 #include <utils/String16.h>
-#include <wifikeystorehal/keystore.h>
 
 using namespace std;
 using namespace ::testing;
@@ -30,7 +32,8 @@ using namespace android;
 using namespace android::binder;
 using namespace android::security::keystore;
 using namespace android::security::keymaster;
-using namespace android::system::wifi::keystore::V1_0;
+using android::security::keystore::IKeystoreService;
+using android::system::wifi::keystore::V1_0::IKeystore;
 
 int main(int argc, char** argv) {
     // Start thread pool for Binder
@@ -52,7 +55,8 @@ enum KeyPurpose {
 class WifiKeystoreHalTest : public Test {
    protected:
     void SetUp() override {
-        keystore = implementation::HIDL_FETCH_IKeystore(nullptr);
+        keystore = IKeystore::getService();
+        ASSERT_TRUE(keystore);
 
         sp<android::IServiceManager> service_manager = android::defaultServiceManager();
         sp<android::IBinder> keystore_binder =
@@ -198,7 +202,7 @@ class WifiKeystoreHalTest : public Test {
     constexpr static const char kTestKeyName[] = "TestKeyName";
     constexpr static const int32_t UID_SELF = -1;
 
-    IKeystore* keystore = nullptr;
+    sp<IKeystore> keystore;
     sp<IKeystoreService> service;
 };
 
@@ -206,7 +210,7 @@ class WifiKeystoreHalTest : public Test {
  * Test for the Wifi Keystore HAL's sign() call.
  */
 TEST_F(WifiKeystoreHalTest, Sign) {
-    IKeystore::KeystoreStatusCode statusCode;
+    ::android::system::wifi::keystore::V1_0::IKeystore::KeystoreStatusCode statusCode;
 
     auto callback = [&statusCode](IKeystore::KeystoreStatusCode status,
                                   const ::android::hardware::hidl_vec<uint8_t>& /*value*/) {