CDD: Clarify the condition for reqs under section 3.5.1 and 8.3 and

 the timing of user notification for 3.5.1/C-1-5

- Updated 3.5.1/C-1-5 to specify the timing of user notification
for better user experience.
- Clarified the conditions for 3.5.1 and 8.3 that the former apply
 to proprietary app restrictions that are more restrictive than "rare"
 standby bucket.

Bug: 145312968

Change-Id: I5965e80b7d631da9ef4363a9a5dd090ba365b4cb

2 files changed, 15 insertions, 6 deletions

diff --git a/3_software/3_5_api-behavioral-compatibility.md b/3_software/3_5_api-behavioral-compatibility.md
index 70004edf..fac707ee 100644
--- a/3_software/3_5_api-behavioral-compatibility.md
+++ b/3_software/3_5_api-behavioral-compatibility.md
@@ -77,10 +77,11 @@ with the Android Open Source Project. For this reason, device implementers
 SHOULD use the source code available via the Android Open Source Project where
 possible, rather than re-implement significant parts of the system.
 
-## 3.5.1\. Background Restriction
+## 3.5.1\. Application Restriction
 
-If device implementations implement the app restrictions that are included in
-AOSP or extend the app restrictions, they:
+If device implementations implement a proprietary mechanism to restrict apps and
+that mechanism is more restrictive than [the Rare App Standby Bucket](
+https://developer.android.com/topic/performance/power/power-details), they:
 
 *    [C-1-1] MUST provide user affordance where the user can see the list of
 restricted apps.
@@ -97,7 +98,8 @@ the market, MUST NOT be used as criteria.
 has turned off app restrictions manually, and MAY suggest the user to apply
 app restrictions.
 *    [C-1-5] MUST inform users if app restrictions are applied to an app
-automatically.
+automatically. Such information MUST be provided within 24 hours of when
+the restrictions are applied.
 *    [C-1-6] MUST return `true` for [`ActivityManager.isBackgroundRestricted()`](
 https://developer.android.com/reference/android/app/ActivityManager.html#isBackgroundRestricted%28%29)
 when the restricted app calls this API.
diff --git a/8_performance-and-power/8_3_power-saving-modes.md b/8_performance-and-power/8_3_power-saving-modes.md
index 488d3013..84eced92 100644
--- a/8_performance-and-power/8_3_power-saving-modes.md
+++ b/8_performance-and-power/8_3_power-saving-modes.md
@@ -1,8 +1,9 @@
 ## 8.3\. Power-Saving Modes
 
 If device implementations include features to improve device power management
-that are included in AOSP or extend the features that are included in AOSP,
-they:
+that are included in AOSP (e.g. App Standby Bucket, Doze) or extend the features
+that do not apply harder restrictions than [the Rare App Standby Bucket](
+https://developer.android.com/topic/performance/power/power-details), they:
 
 *   [C-1-1] MUST NOT deviate from the AOSP implementation for the triggering,
     maintenance, wakeup algorithms and the use of global system settings of App
@@ -26,6 +27,12 @@ they:
 *   [C-SR] Are STRONGLY RECOMMENDED to provide user affordance to display all
     Apps that are exempted from App Standby and Doze power-saving modes.
 
+If device implementations extend power management features that are included
+in AOSP and that extension applies more stringent restrictions than
+[the Rare App Standby Bucket](
+https://developer.android.com/topic/performance/power/power-details), refer to
+[section 3.5.1](#3_5_api-behavioral-compatibility).
+
 In addition to the power-saving modes, Android device implementations MAY
 implement any or all of the 4 sleeping power states as defined by the Advanced
 Configuration and Power Interface (ACPI).