Rename IKeymaster back to IKeymaserDevice
Test: VtsHalKeymasterV4_0TargetTest
Change-Id: Ic5e7f936ef75aa64834677f6589822fbedce39cd
diff --git a/keymaster/4.0/Android.bp b/keymaster/4.0/Android.bp
index 2d4e7bf..34997d2 100644
--- a/keymaster/4.0/Android.bp
+++ b/keymaster/4.0/Android.bp
@@ -8,7 +8,7 @@
},
srcs: [
"types.hal",
- "IKeymaster.hal",
+ "IKeymasterDevice.hal",
],
interfaces: [
"android.hardware.keymaster@3.0",
diff --git a/keymaster/4.0/IKeymaster.hal b/keymaster/4.0/IKeymasterDevice.hal
similarity index 99%
rename from keymaster/4.0/IKeymaster.hal
rename to keymaster/4.0/IKeymasterDevice.hal
index b841832..06b4b73 100644
--- a/keymaster/4.0/IKeymaster.hal
+++ b/keymaster/4.0/IKeymasterDevice.hal
@@ -23,7 +23,7 @@
* Keymaster device definition. For thorough documentation see the implementer's reference, at
* https://source.android.com/security/keystore/implementer-ref.html
*/
-interface IKeymaster {
+interface IKeymasterDevice {
/**
* Returns information about the underlying keymaster hardware.
diff --git a/keymaster/4.0/default/service.cpp b/keymaster/4.0/default/service.cpp
index adb27e1..f4b5fd3 100644
--- a/keymaster/4.0/default/service.cpp
+++ b/keymaster/4.0/default/service.cpp
@@ -16,13 +16,13 @@
*/
#include <android-base/logging.h>
-#include <android/hardware/keymaster/4.0/IKeymaster.h>
+#include <android/hardware/keymaster/4.0/IKeymasterDevice.h>
#include <hidl/HidlTransportSupport.h>
-#include <AndroidKeymaster4.h>
+#include <AndroidKeymaster4Device.h>
int main() {
- auto keymaster = ::keymaster::V4_0::ng::CreateKeymaster();
+ auto keymaster = ::keymaster::V4_0::ng::CreateKeymasterDevice();
auto status = keymaster->registerAsService();
if (status != android::OK) {
LOG(FATAL) << "Could not register service for Keymaster 4.0 (" << status << ")";
diff --git a/keymaster/4.0/support/include/keymasterV4_0/attestation_record.h b/keymaster/4.0/support/include/keymasterV4_0/attestation_record.h
index c993d6b..203b349 100644
--- a/keymaster/4.0/support/include/keymasterV4_0/attestation_record.h
+++ b/keymaster/4.0/support/include/keymasterV4_0/attestation_record.h
@@ -17,7 +17,7 @@
#ifndef HARDWARE_INTERFACES_KEYMASTER_40_VTS_FUNCTIONAL_ATTESTATION_RECORD_H_
#define HARDWARE_INTERFACES_KEYMASTER_40_VTS_FUNCTIONAL_ATTESTATION_RECORD_H_
-#include <android/hardware/keymaster/4.0/IKeymaster.h>
+#include <android/hardware/keymaster/4.0/IKeymasterDevice.h>
namespace android {
namespace hardware {
diff --git a/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h b/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h
index 7e3b008..a3aae8b 100644
--- a/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h
+++ b/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h
@@ -59,7 +59,7 @@
* value1.isOk() yields false, but value2.isOk() yields true, thus value2.value() is save to access.
*/
-#include <android/hardware/keymaster/4.0/IKeymaster.h>
+#include <android/hardware/keymaster/4.0/IKeymasterDevice.h>
#include <type_traits>
diff --git a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
index d26b6b9..38dd302 100644
--- a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
+++ b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -22,7 +22,7 @@
#include <openssl/evp.h>
#include <openssl/x509.h>
-#include <android/hardware/keymaster/4.0/IKeymaster.h>
+#include <android/hardware/keymaster/4.0/IKeymasterDevice.h>
#include <android/hardware/keymaster/4.0/types.h>
#include <cutils/properties.h>
#include <keymaster/keymaster_configuration.h>
@@ -409,7 +409,7 @@
return instance;
}
- void registerTestServices() override { registerTestService<IKeymaster>(); }
+ void registerTestServices() override { registerTestService<IKeymasterDevice>(); }
private:
KeymasterHidlEnvironment(){};
@@ -428,8 +428,10 @@
// SetUpTestCase runs only once per test case, not once per test.
static void SetUpTestCase() {
- string service_name = KeymasterHidlEnvironment::Instance()->getServiceName<IKeymaster>();
- keymaster_ = ::testing::VtsHalHidlTargetTestBase::getService<IKeymaster>(service_name);
+ string service_name =
+ KeymasterHidlEnvironment::Instance()->getServiceName<IKeymasterDevice>();
+ keymaster_ =
+ ::testing::VtsHalHidlTargetTestBase::getService<IKeymasterDevice>(service_name);
ASSERT_NE(keymaster_, nullptr);
ASSERT_TRUE(keymaster_
@@ -447,7 +449,7 @@
static void TearDownTestCase() { keymaster_.clear(); }
- static IKeymaster& keymaster() { return *keymaster_; }
+ static IKeymasterDevice& keymaster() { return *keymaster_; }
static uint32_t os_version() { return os_version_; }
static uint32_t os_patch_level() { return os_patch_level_; }
@@ -874,7 +876,7 @@
OperationHandle op_handle_ = kOpHandleSentinel;
private:
- static sp<IKeymaster> keymaster_;
+ static sp<IKeymasterDevice> keymaster_;
static uint32_t os_version_;
static uint32_t os_patch_level_;
@@ -942,7 +944,7 @@
return true;
}
-sp<IKeymaster> KeymasterHidlTest::keymaster_;
+sp<IKeymasterDevice> KeymasterHidlTest::keymaster_;
uint32_t KeymasterHidlTest::os_version_;
uint32_t KeymasterHidlTest::os_patch_level_;
bool KeymasterHidlTest::is_secure_;