diff --git a/docs/html/training/monitoring-device-state/doze-standby.jd b/docs/html/training/monitoring-device-state/doze-standby.jd index 77db1405bb538..baaed7b0ff1ef 100644 --- a/docs/html/training/monitoring-device-state/doze-standby.jd +++ b/docs/html/training/monitoring-device-state/doze-standby.jd @@ -17,20 +17,21 @@ next.link=battery-monitoring.html
  1. Understanding Doze
      -
    1. Doze Restrictions
    2. -
    3. Assessing Your App
    4. -
    5. Using GCM to Interact with Your App
    6. +
    7. Doze restrictions
    8. +
    9. Adapting your app to Doze
  2. Understanding App Standby
  3. -
  4. Support for Other Use-Cases
  5. -
  6. Testing +
  7. Using GCM to Interact with Your App
  8. +
  9. Support for Other Use Cases
  10. +
  11. Testing with Doze and App +Standby
      -
    1. With Doze
    2. -
    3. With App Standby
    4. +
    5. Testing your app with Doze
    6. +
    7. Testing your app with App Standby
  12. -
  13. Appendix
  14. +
  15. Example Use Cases for Whitelisting
@@ -38,11 +39,10 @@ next.link=battery-monitoring.html

Starting from Android 6.0 (API level 23), Android introduces two power-saving features that extend battery life for users by managing how apps behave when a - device is not plugged into a power source. Doze reduces power consumption by deferring - background - CPU and network activity for apps when the device is unused for long periods + device is not connected to a power source. Doze reduces battery consumption by deferring + background CPU and network activity for apps when the device is unused for long periods of time. App Standby defers background network activity for apps - that are not recently used. + with which the user has not recently interacted.

@@ -58,23 +58,23 @@ next.link=battery-monitoring.html

If a user leaves a device unplugged and stationary for a period of time, with the screen off, the device enters Doze mode. In Doze mode, the system - attempts to conserve battery by restricting apps ‘ access to network and - CPU-intensive services. It prevents apps from accessing the network and + attempts to conserve battery by restricting apps' access to network and + CPU-intensive services. It also prevents apps from accessing the network and defers their jobs, syncs, and standard alarms.

Periodically, the system exits Doze for a brief time to let apps complete their deferred activities. During this maintenance window, the - system runs all pending syncs, jobs, and alarms and lets apps access the + system runs all pending syncs, jobs, and alarms, and lets apps access the network.

- Doze provides a recurring maintenance window for apps to use the network - and handle pending activities. + Figure 1. Doze provides a recurring maintenance window for apps to use the + network and handle pending activities.

@@ -82,7 +82,7 @@ next.link=battery-monitoring.html At the conclusion of each maintenance window, the system again enters Doze, suspending network access and deferring jobs, syncs, and alarms. Over time, the system schedules maintenance windows less and less frequently, helping to - save battery in cases of longer-term inactivity when the device is not + reduce battery consumption in cases of longer-term inactivity when the device is not connected to a charger.

@@ -101,10 +101,11 @@ next.link=battery-monitoring.html