Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keystore 2.0 SPI: Implement modification time." am: d2e7c2e000 am: f462515bea am: 01cd87c421

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7eeb2f1733c724a241f6ce0a5a52a60444def83
This commit is contained in:
Treehugger Robot
2020-12-17 05:12:01 +00:00
committed by Automerger Merge Worker
parent 12f7e5a72b 01cd87c421
commit 1e051f99ba
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
View File

@@ -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