Merge "Docs: Clarified certain restrictions to whitelisted apps" into nyc-dev

docs/html/training/monitoring-device-state/doze-standby.jd

@@ -306,25 +306,22 @@ Standby</a>
 </p>
 
 <p>
-  An app that is whitelisted can use the network and hold
+  An app that is whitelisted can use the network and hold <a href=
-
+  "{@docRoot}reference/android/os/PowerManager.html#PARTIAL_WAKE_LOCK">partial
-  <a href="{@docRoot}reference/android/os/PowerManager.html#PARTIAL_WAKE_LOCK">
+  wake locks</a> during Doze and App Standby. However, <strong>other
-  partial wake locks</a> during Doze and
+  restrictions still apply</strong> to the whitelisted app, just as they do to
-  App Standby. However, <strong>other restrictions still apply</strong> to the
+  other apps. For example, the whitelisted app’s jobs and syncs are deferred
-  whitelisted app, just as they do to other apps. For example, the whitelisted
+  (on API level 23 and below), and its regular {@link android.app.AlarmManager}
-  app’s jobs and syncs are deferred, and its regular {@link android.app.AlarmManager} alarms do not
+  alarms do not fire. An app can check whether it is currently on the exemption
-  fire. An app can check whether it is currently on the exemption whitelist by
+  whitelist by calling {@link
-  calling {@link
   android.os.PowerManager#isIgnoringBatteryOptimizations(java.lang.String)
   isIgnoringBatteryOptimizations()}.
-  </li>
 </p>
 
 <p>
   Users can manually configure the whitelist in <strong>Settings &gt; Battery
   &gt; Battery Optimization.</strong> Alternatively, the system provides
   ways for apps to ask users to whitelist them.
-
 </p>
 
 <ul>