diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-30 00:27:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 00:27:21 +0000 |
| commit | ee4bd11c4cfc7a2a78ace23da42c1de59545f3bf (patch) | |
| tree | 6f6993817715953d27844796cb1c2152ab241e58 /api | |
| parent | 4010631b49f0629d1052742bf9e7f973162c8b71 (diff) | |
| parent | 8fa0eecc4fa569fe89273ddb3234f03bf1c567ec (diff) | |
| download | frameworks_base-ee4bd11c4cfc7a2a78ace23da42c1de59545f3bf.zip frameworks_base-ee4bd11c4cfc7a2a78ace23da42c1de59545f3bf.tar.gz frameworks_base-ee4bd11c4cfc7a2a78ace23da42c1de59545f3bf.tar.bz2 | |
am 8fa0eecc: am 789d9dc7: am 33c9dde9: Merge "Add KeyPermanentlyInvalidatedException." into mnc-dev
* commit '8fa0eecc4fa569fe89273ddb3234f03bf1c567ec':
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 0823b6c..e4bd756 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28617,6 +28617,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 { } @@ -28697,11 +28703,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 c233699..9b01d24 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30630,6 +30630,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 { } @@ -30710,11 +30716,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); |