diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-05-08 15:25:48 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-05-08 15:56:59 -0700 |
| commit | 5418393c58d1d80fe37a209ab931f6d56bd46a86 (patch) | |
| tree | f44684be6f62629d0aa78a0761c444d1ff9896de /api | |
| parent | b2fa5f3160cfc9b1703c6970649a926370971ea9 (diff) | |
| download | frameworks_base-5418393c58d1d80fe37a209ab931f6d56bd46a86.zip frameworks_base-5418393c58d1d80fe37a209ab931f6d56bd46a86.tar.gz frameworks_base-5418393c58d1d80fe37a209ab931f6d56bd46a86.tar.bz2 | |
Document when encrypted AndroidKeyStore keys are wiped.
This also drops the boolean parameter from
KeyGeneratorSpec.Builder.setEncryptionRequired to match the already
launched KeyPairGeneratorSpec.Builder.setEncryptionRequired.
Bug: 18088752
Change-Id: I91a3e8c77958971b1bda8329319f1a0d8043b669
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 07137f1..b89edcf 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 00da3d3..1bf273a 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); |