Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1aeea8c9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Delete keymaster0" am: 02cdce19 

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

Change-Id: I3ed294c69ce86a036110fb5c5a95fb6f5737ac07
parents 012ae9cc 02cdce19

keymaster/3.0/default/KeymasterDevice.cpp

+1 −16
Original line number Diff line number Diff line
@@ -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);

    } else if (mod->module_api_version == KEYMASTER_MODULE_API_VERSION_1_0) {

        keymaster1_device_t* dev = nullptr;

        if (get_keymaster1_dev(&dev, mod)) {