From 5418393c58d1d80fe37a209ab931f6d56bd46a86 Mon Sep 17 00:00:00 2001
From: Alex Klyubin <klyubin@google.com>
Date: Fri, 8 May 2015 15:25:48 -0700
Subject: 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
---
 api/current.txt        | 2 +-
 api/system-current.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'api')

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);
-- 
cgit v1.1