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

Commit fc20ddde authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Keymint/secureclock: Add Rust derives to some of the types. am: 6bb888fe 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1f84e4a09fbdc7a841a3f96a9a7450fac8eb34f
parents 689e51eb 6bb888fe

security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/HardwareAuthToken.aidl

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.security.keymint;

@VintfStability

@RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability

parcelable HardwareAuthToken {

  long challenge;

  long userId;

security/keymint/aidl/android/hardware/security/keymint/HardwareAuthToken.aidl

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.hardware.security.keymint.HardwareAuthenticatorType; 
 * appropriate for a given key operation.

 */

@VintfStability

@RustDerive(Clone=true, Eq=true, PartialEq=true, Ord=true, PartialOrd=true, Hash=true)

parcelable HardwareAuthToken {

    /**

     * challenge is a value that's used to enable authentication tokens to authorize specific

security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.hardware.security.keymint.KeyParameter; 
import android.hardware.security.keymint.KeyMintHardwareInfo;

import android.hardware.security.keymint.KeyPurpose;

import android.hardware.security.keymint.SecurityLevel;

import android.hardware.security.secureclock.TimeStampToken;



/**

 * KeyMint device definition.

security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/TimeStampToken.aidl

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.security.secureclock;

@VintfStability

@RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability

parcelable TimeStampToken {

  long challenge;

  android.hardware.security.secureclock.Timestamp timestamp;

security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/Timestamp.aidl

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.security.secureclock;

@VintfStability

@RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability

parcelable Timestamp {

  long milliSeconds;

}