Merge "Implement keymint V1 aidl interfaces, service module, and vts tests." am: 0ab081bfa6 (ce186019) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/compatibility_matrix.current.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -298,6 +298,14 @@
		<instance>strongbox</instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.keymint</name>
		<interface>
		<name>IKeyMintDevice</name>
		<instance>default</instance>
		<instance>strongbox</instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.light</name>
		<interface>

+0 −9

Original line number	Diff line number	Diff line
		@@ -20,12 +20,3 @@ aidl_interface {
		"2",
		],
		}

		// This is a reminder that the next version of keymaster should be frozen at
		// version "5" to avoid confusion with other versions of this interface.
		cc_library {
		name: "android.hardware.keymaster-V3-java",
		}
		cc_library {
		name: "android.hardware.keymaster-V4-java",
		}

+1 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright 2020 The Android Open Source Project
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.

+8 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,14 @@

		package android.hardware.keymaster;


		/**
		* Time in milliseconds since some arbitrary point in time. Time must be monotonically increasing,
		* and a secure environment's notion of "current time" must not repeat until the Android device
		* reboots, or until at least 50 million years have elapsed (note that this requirement is satisfied
		* by setting the clock to zero during each boot, and then counting time accurately).
		*/

		@VintfStability
		parcelable Timestamp {
		long milliSeconds;

+2 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright 2020 The Android Open Source Project
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -18,7 +18,6 @@ package android.hardware.keymaster;

		import android.hardware.keymaster.SecurityLevel;
		import android.hardware.keymaster.Timestamp;
		import android.hardware.keymaster.HardwareAuthenticatorType;

		/**
		* VerificationToken instances are used for secure environments to authenticate one another.
		@@ -40,6 +39,7 @@ parcelable VerificationToken {
		*/
		Timestamp timestamp;


		/**
		* SecurityLevel of the secure environment that generated the token.
		*/