aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert McMeen <amcmeen@google.com>2015-10-07 23:43:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-07 23:43:38 +0000
commit39f5efb7f1cdc69fdee8c5d082dcf3ced3fb5aea (patch)
tree214e45b1c91ee804777628b35db4f9a7b9397ac0
parent7a1522fb7ba1c1f12b26a4740ee2f09e30c5d398 (diff)
parent83ceaf234941caa89794750e6fe5cbc177238a39 (diff)
downloadsource.android.com-39f5efb7f1cdc69fdee8c5d082dcf3ced3fb5aea.tar.gz
Merge "CDD: Add Data Deletion section" into mnc-dev
-rw-r--r--src/compatibility/android-cdd.html12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/compatibility/android-cdd.html b/src/compatibility/android-cdd.html
index 0d02022b..0dc95812 100644
--- a/src/compatibility/android-cdd.html
+++ b/src/compatibility/android-cdd.html
@@ -313,6 +313,8 @@
<p class="toc_h2"><a href="#9_11_keys_and_credentials">9.11. Keys and Credentials</a></p>
+<p class="toc_h2"><a href="#9_12_data_deletion">9.12. Data Deletion</a></p>
+
<p class="toc_h1"><a href="#10_software_compatibility_testing">10. Software Compatibility Testing</a></p>
<p class="toc_h2"><a href="#10_1_compatibility_test_suite">10.1. Compatibility Test Suite</a></p>
@@ -4818,6 +4820,16 @@ than 8,192 keys to be imported.</li>
not implemented a trusted operating system on the secure hardware, such a device cannot meet
the above TEE-related requirements through a system software update and thus is exempted from these TEE-related requirements.</p>
+<h2 id="9_12_data_deletion">9.12. Data Deletion</h2>
+
+<p>Devices MUST provide users with a mechanism to perform a "Factory Data Reset"
+that allows logical and physical deletion of all data. This MUST satisfy relevant
+industry standards for data deletion such as NIST SP800-88. This MUST be used for
+the implementation of the wipeData() API (part of the Android Device Administration API)
+described in <a href="#3_9_device_administration">section 3.9 Device Administration.</p>
+
+<p>Devices MAY provide a fast data wipe that conducts a logical data erase.</p>
+
<h1 id="10_software_compatibility_testing">10. Software Compatibility Testing</h1>