Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Delete keymaster0" am: 02cdce19c1 am: 1aeea8c95b am: 7bd15a3d38

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1515113

Change-Id: Iccde59936d10078dd3e31041153c9a8369d11bdb
This commit is contained in:
Treehugger Robot
2020-12-07 20:55:17 +00:00
committed by Automerger Merge Worker
parent 62b4b39f36 7bd15a3d38
commit a71b2fc0f6
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
keymaster/3.0/default/KeymasterDevice.cpp
View File

@@ -22,7 +22,6 @@
#include <log/log.h>
#include <AndroidKeymaster3Device.h>
#include <hardware/keymaster0.h>
#include <hardware/keymaster1.h>
#include <hardware/keymaster2.h>
#include <hardware/keymaster_defs.h>
@@ -33,16 +32,6 @@ namespace keymaster {
namespace V3_0 {
namespace implementation {
static int get_keymaster0_dev(keymaster0_device_t** dev, const hw_module_t* mod) {
int rc = keymaster0_open(mod, dev);
if (rc) {
ALOGE("Error opening keystore keymaster0 device.");
*dev = nullptr;
return rc;
}
return 0;
}
static int get_keymaster1_dev(keymaster1_device_t** dev, const hw_module_t* mod) {
int rc = keymaster1_open(mod, dev);
if (rc) {
@@ -75,11 +64,7 @@ static IKeymasterDevice* createKeymaster3Device() {
}
if (mod->module_api_version < KEYMASTER_MODULE_API_VERSION_1_0) {
keymaster0_device_t* dev = nullptr;
if (get_keymaster0_dev(&dev, mod)) {
return nullptr;
}
return ::keymaster::ng::CreateKeymasterDevice(dev);
return nullptr;
} else if (mod->module_api_version == KEYMASTER_MODULE_API_VERSION_1_0) {
keymaster1_device_t* dev = nullptr;
if (get_keymaster1_dev(&dev, mod)) {