CDD: Clarify the scope of the data deletion requirement
Section: 9.12. Data Deletion
Some device implementations pre-install apps or other resources
outside the system image, and these would not have to be wiped out
as part ofthe factory reset.
Bug: 24974205
Change-Id: I7f7fbf8e1c6657fc06a41424f7e931b1c73be852
diff --git a/src/compatibility/6.0/android-6.0-cdd.html b/src/compatibility/6.0/android-6.0-cdd.html
index 4ef614f..80e27b1 100644
--- a/src/compatibility/6.0/android-6.0-cdd.html
+++ b/src/compatibility/6.0/android-6.0-cdd.html
@@ -5067,10 +5067,12 @@
<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</a>.</p>
+that allows logical and physical deletion of all data except for the system image
+and data in other partitions that can be regarded as part of the sytem image.
+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</a>.</p>
<p>Devices MAY provide a fast data wipe that conducts a logical data erase.</p>
diff --git a/src/compatibility/android-cdd.html b/src/compatibility/android-cdd.html
index 51970c9..b6bfd38 100644
--- a/src/compatibility/android-cdd.html
+++ b/src/compatibility/android-cdd.html
@@ -5069,10 +5069,12 @@
<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</a>.</p>
+that allows logical and physical deletion of all data except for the system image and any
+operating system files required by the system image. All user-generated data MUST be deleted.
+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</a>.</p>
<p>Devices MAY provide a fast data wipe that conducts a logical data erase.</p>
