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

Commit 1e051f99 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0 SPI: Implement modification time." am: d2e7c2e0 am: f462515b am: 01cd87c4 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7eeb2f1733c724a241f6ce0a5a52a60444def83
parents 12f7e5a7 01cd87c4

keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java

+4 −7
Original line number Diff line number Diff line
@@ -250,13 +250,10 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { 
            return null;

        }





        // TODO add modification time to key metadata.

        if (response.metadata.modificationTimeMs == -1) {

            return null;

        // if (response.metadata.modificationTime == -1) {

        //     return null;

        // }

        // return new Date(response.metadata.modificationTime);

        }

        return new Date(response.metadata.modificationTimeMs);

    }



    @Override