summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-04-09 17:31:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-09 17:31:16 +0000
commit52f57de9f618f4b3303fb9b59084e775f5312984 (patch)
tree478431d62e61d0e2821a802c1a06b7afd8f74c6f /keystore
parentc9d83fc2e0f2e6f24b9f7957cc9650b3e866cf1d (diff)
parentbbf3cc5797293dc915d7ecfe41e85bbe5682548d (diff)
downloadframeworks_base-52f57de9f618f4b3303fb9b59084e775f5312984.zip
frameworks_base-52f57de9f618f4b3303fb9b59084e775f5312984.tar.gz
frameworks_base-52f57de9f618f4b3303fb9b59084e775f5312984.tar.bz2
am bbf3cc57: am fd168151: am e26347bb: Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired."
* commit 'bbf3cc5797293dc915d7ecfe41e85bbe5682548d': Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.
Diffstat (limited to 'keystore')
-rw-r--r--keystore/java/android/security/KeyStoreParameter.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyStoreParameter.java b/keystore/java/android/security/KeyStoreParameter.java
index 13ede1a..ff63a25 100644
--- a/keystore/java/android/security/KeyStoreParameter.java
+++ b/keystore/java/android/security/KeyStoreParameter.java
@@ -450,8 +450,9 @@ public final class KeyStoreParameter implements ProtectionParameter {
* ciphertext.</li>
* <li>If you are using RSA encryption without padding, consider switching to padding
* schemes which offer {@code IND-CPA}, such as PKCS#1 or OAEP.</li>
- *
* </ul>
+ *
+ * @hide
*/
public Builder setRandomizedEncryptionRequired(boolean required) {
mRandomizedEncryptionRequired = required;