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

Commit 32aa7ecb authored by Shawn Willden's avatar Shawn Willden
Browse files

Rename IKeymaster back to IKeymaserDevice 

Test: VtsHalKeymasterV4_0TargetTest
Change-Id: Ic5e7f936ef75aa64834677f6589822fbedce39cd
parent dec548b0

keymaster/4.0/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ hidl_interface { 
    },

    srcs: [

        "types.hal",

        "IKeymaster.hal",

        "IKeymasterDevice.hal",

    ],

    interfaces: [

        "android.hardware.keymaster@3.0",

keymaster/4.0/IKeymaster.hal→keymaster/4.0/IKeymasterDevice.hal

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.hardware.keymaster@3.0::KeyFormat; 
 * 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.

keymaster/4.0/default/service.cpp

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

keymaster/4.0/support/include/keymasterV4_0/attestation_record.h

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

keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h

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