From fbf2ed5f1907d3bb89378d5ae8c81b89f19b8725 Mon Sep 17 00:00:00 2001
From: Janis Danisevskis <jdanis@google.com>
Date: Tue, 15 Dec 2020 13:06:12 -0800
Subject: Keystore 2.0 SPI: Implement modification time.

Test: Keystore CTS test.
Change-Id: I097b58fa6c403ff426d99ed484ed324e1419b4e3
---
 .../java/android/security/keystore2/AndroidKeyStoreSpi.java   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'keystore/java')

diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
index aca531458382..c42c7b2c41b0 100644
--- a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
+++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
@@ -250,13 +250,10 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
             return null;
         }
 
-
-        // TODO add modification time to key metadata.
-        return null;
-        // if (response.metadata.modificationTime == -1) {
-        //     return null;
-        // }
-        // return new Date(response.metadata.modificationTime);
+        if (response.metadata.modificationTimeMs == -1) {
+            return null;
+        }
+        return new Date(response.metadata.modificationTimeMs);
     }
 
     @Override
-- 
cgit v1.2.3-59-g8ed1b