Merge "Merge "Docs: Minor fixes to Background Optimizations and Doze docs" into mnc-mr-docs am: 6bd5c3d am: a572a3a am: d7f4b76" into nyc-dev
diff --git a/docs/html/preview/features/background-optimization.jd b/docs/html/preview/features/background-optimization.jd
index e415bd3..79ba5c8 100644
--- a/docs/html/preview/features/background-optimization.jd
+++ b/docs/html/preview/features/background-optimization.jd
@@ -112,7 +112,7 @@
<p class="note">
<strong>Note:</strong> A {@link android.content.BroadcastReceiver} registered with
{@link android.content.Context#registerReceiver Context.registerReceiver()}
- continues to receive these broadcasts while the app is in the foreground.
+ continues to receive these broadcasts while the app is running.
</p>
<h3 id="sched-jobs">
@@ -269,7 +269,7 @@
MY_BACKGROUND_JOB,
new ComponentName(context, MediaContentJob.class));
builder.addTriggerContentUri(
- new JobInfo.TriggerContentUri(MEDIA_URI,
+ new JobInfo.TriggerContentUri(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));
js.schedule(builder.build());
}
diff --git a/docs/html/training/monitoring-device-state/doze-standby.jd b/docs/html/training/monitoring-device-state/doze-standby.jd
index 11e81c1..9250288 100644
--- a/docs/html/training/monitoring-device-state/doze-standby.jd
+++ b/docs/html/training/monitoring-device-state/doze-standby.jd
@@ -205,13 +205,14 @@
you can set alarms that will fire even if the device is in Doze.
</p>
-<p class="note"><strong>Note:</strong> Neither
-{@link
+<p class="note">
+ <strong>Note:</strong> Neither {@link
android.app.AlarmManager#setAndAllowWhileIdle(int, long,
android.app.PendingIntent) setAndAllowWhileIdle()} nor {@link
android.app.AlarmManager#setExactAndAllowWhileIdle(int, long,
- android.app.PendingIntent) setExactAndAllowWhileIdle()} can fire alarms more than once per 15
-minutes per app.</p>
+ android.app.PendingIntent) setExactAndAllowWhileIdle()} can fire alarms more
+ than once per 9 minutes, per app.
+</p>
<p>
The Doze restriction on network access is also likely to affect your app,