diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-30 00:16:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 00:16:10 +0000 |
| commit | 8fa0eecc4fa569fe89273ddb3234f03bf1c567ec (patch) | |
| tree | cf8d40df1faf370e90cadf79b82805f055b299f7 /api | |
| parent | 7b21b4cb238621760d57fbb3b974bc53bac8937b (diff) | |
| parent | 789d9dc733d4a3a15e83eb2aa0e49f548fe81618 (diff) | |
| download | frameworks_base-8fa0eecc4fa569fe89273ddb3234f03bf1c567ec.zip frameworks_base-8fa0eecc4fa569fe89273ddb3234f03bf1c567ec.tar.gz frameworks_base-8fa0eecc4fa569fe89273ddb3234f03bf1c567ec.tar.bz2 | |
am 789d9dc7: am 33c9dde9: Merge "Add KeyPermanentlyInvalidatedException." into mnc-dev
* commit '789d9dc733d4a3a15e83eb2aa0e49f548fe81618':
Add KeyPermanentlyInvalidatedException.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 11 | ||||
| -rw-r--r-- | api/system-current.txt | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt index bc4931b..f67270e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28616,6 +28616,12 @@ package android.security { method public android.security.KeyPairGeneratorSpec.Builder setUserAuthenticationValidityDurationSeconds(int); } + public class KeyPermanentlyInvalidatedException extends java.security.InvalidKeyException { + ctor public KeyPermanentlyInvalidatedException(); + ctor public KeyPermanentlyInvalidatedException(java.lang.String); + ctor public KeyPermanentlyInvalidatedException(java.lang.String, java.lang.Throwable); + } + public abstract class KeyStoreKeyProperties { } @@ -28696,11 +28702,6 @@ package android.security { method public boolean isCleartextTrafficPermitted(); } - public class NewFingerprintEnrolledException extends java.security.InvalidKeyException { - ctor public NewFingerprintEnrolledException(); - ctor public NewFingerprintEnrolledException(java.lang.String); - } - public class UserNotAuthenticatedException extends java.security.InvalidKeyException { ctor public UserNotAuthenticatedException(); ctor public UserNotAuthenticatedException(java.lang.String); diff --git a/api/system-current.txt b/api/system-current.txt index 503ccba..bac38d9 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30629,6 +30629,12 @@ package android.security { method public android.security.KeyPairGeneratorSpec.Builder setUserAuthenticationValidityDurationSeconds(int); } + public class KeyPermanentlyInvalidatedException extends java.security.InvalidKeyException { + ctor public KeyPermanentlyInvalidatedException(); + ctor public KeyPermanentlyInvalidatedException(java.lang.String); + ctor public KeyPermanentlyInvalidatedException(java.lang.String, java.lang.Throwable); + } + public abstract class KeyStoreKeyProperties { } @@ -30709,11 +30715,6 @@ package android.security { method public boolean isCleartextTrafficPermitted(); } - public class NewFingerprintEnrolledException extends java.security.InvalidKeyException { - ctor public NewFingerprintEnrolledException(); - ctor public NewFingerprintEnrolledException(java.lang.String); - } - public class UserNotAuthenticatedException extends java.security.InvalidKeyException { ctor public UserNotAuthenticatedException(); ctor public UserNotAuthenticatedException(java.lang.String); |