tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove libvintf from credstore"

Browse source
This commit is contained in:
Devin Moore 2023-05-24 21:40:26 +00:00 committed by Gerrit Code Review
commit e6d927309e
4 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
identity/Android.bp
View file

@ -54,7 +54,6 @@ cc_binary {
"liblog",
"libutils",
"libutilscallstack",
"libvintf",
],
static_libs: [
"android.hardware.keymaster-V3-cpp",

1
identity/CredentialStore.cpp
View file

@ -25,7 +25,6 @@
#include <binder/IPCThreadState.h>
#include <binder/IServiceManager.h>
#include <rkp/support/rkpd_client.h>
#include <vintf/VintfObject.h>
#include "Credential.h"
#include "CredentialData.h"

1
provisioner/support/Android.bp
View file

@ -31,7 +31,6 @@ cc_defaults {
"libbase",
"libbinder",
"libutils",
"libvintf",
],
cflags: [
"-Wall",

11
provisioner/support/rkpd_client.cpp
View file

@ -26,7 +26,6 @@
#include <binder/IServiceManager.h>
#include <binder/Status.h>
#include <rkp/support/rkpd_client.h>
#include <vintf/VintfObject.h>
namespace android::security::rkp::support {
namespace {
@ -61,12 +60,10 @@ std::optional<std::string> getRpcId(const sp<IRemotelyProvisionedComponent>& rpc
}
std::optional<String16> findRpcNameById(std::string_view targetRpcId) {
auto deviceManifest = vintf::VintfObject::GetDeviceHalManifest();
auto instances = deviceManifest->getAidlInstances("android.hardware.security.keymint",
"IRemotelyProvisionedComponent");
for (const std::string& instance : instances) {
auto rpcName =
IRemotelyProvisionedComponent::descriptor + String16("/") + String16(instance.c_str());
auto instances = android::defaultServiceManager()->getDeclaredInstances(
IRemotelyProvisionedComponent::descriptor);
for (const auto& instance : instances) {
auto rpcName = IRemotelyProvisionedComponent::descriptor + String16("/") + instance;
sp<IRemotelyProvisionedComponent> rpc =
android::waitForService<IRemotelyProvisionedComponent>(rpcName);