diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-05-08 23:09:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 23:09:16 +0000 |
| commit | 5823756335ec3ecbe024369e24a6b291471cea9a (patch) | |
| tree | 80d9b25917e7e4c508faa6f41a3bf3f5de8ebe97 /api | |
| parent | 69e927c3cd8398e484849f7639fd781e106c1045 (diff) | |
| parent | 5418393c58d1d80fe37a209ab931f6d56bd46a86 (diff) | |
| download | frameworks_base-5823756335ec3ecbe024369e24a6b291471cea9a.zip frameworks_base-5823756335ec3ecbe024369e24a6b291471cea9a.tar.gz frameworks_base-5823756335ec3ecbe024369e24a6b291471cea9a.tar.bz2 | |
Merge "Document when encrypted AndroidKeyStore keys are wiped." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index cea5507..3dc5901 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28432,7 +28432,7 @@ package android.security { method public android.security.KeyGeneratorSpec.Builder setAlias(java.lang.String); method public android.security.KeyGeneratorSpec.Builder setBlockModes(java.lang.String...); method public android.security.KeyGeneratorSpec.Builder setEncryptionPaddings(java.lang.String...); - method public android.security.KeyGeneratorSpec.Builder setEncryptionRequired(boolean); + method public android.security.KeyGeneratorSpec.Builder setEncryptionRequired(); method public android.security.KeyGeneratorSpec.Builder setKeySize(int); method public android.security.KeyGeneratorSpec.Builder setKeyValidityEnd(java.util.Date); method public android.security.KeyGeneratorSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date); diff --git a/api/system-current.txt b/api/system-current.txt index 93e9446..d807563 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30446,7 +30446,7 @@ package android.security { method public android.security.KeyGeneratorSpec.Builder setAlias(java.lang.String); method public android.security.KeyGeneratorSpec.Builder setBlockModes(java.lang.String...); method public android.security.KeyGeneratorSpec.Builder setEncryptionPaddings(java.lang.String...); - method public android.security.KeyGeneratorSpec.Builder setEncryptionRequired(boolean); + method public android.security.KeyGeneratorSpec.Builder setEncryptionRequired(); method public android.security.KeyGeneratorSpec.Builder setKeySize(int); method public android.security.KeyGeneratorSpec.Builder setKeyValidityEnd(java.util.Date); method public android.security.KeyGeneratorSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date); |