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

Commit 887c5236 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 74637db2: Merge "AndroidKeyStore: return error code on error" 

# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '74637db2':
  AndroidKeyStore: return error code on error
parents c4a768c8 74637db2

keystore/java/android/security/KeyStore.java

+6 −1
Original line number Diff line number Diff line
@@ -243,7 +243,12 @@ public class KeyStore { 
     */

    public long getmtime(String key) {

        try {

            return mBinder.getmtime(key) * 1000L;

            final long millis = mBinder.getmtime(key);

            if (millis == -1L) {

                return -1L;

            }



            return millis * 1000L;

        } catch (RemoteException e) {

            Log.w(TAG, "Cannot connect to keystore", e);

            return -1L;