summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-05-06 23:56:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-06 23:56:41 +0000
commit05759d1531f4e36b51f386fa884454eeda88ecb8 (patch)
tree1c802f014e3f81683a2a803440ee51706c056a03 /core/java/android
parent2787ba25fdc4141e74e649922cf982d3f6c0168d (diff)
parent2e6de8fdccf71dc733864c1ea757182cc13303ab (diff)
Merge "add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug: 8746126" into jb-mr2-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/Service.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Service.java b/core/java/android/app/Service.java
index 4fbca7318c27..396774090515 100644
--- a/core/java/android/app/Service.java
+++ b/core/java/android/app/Service.java
@@ -633,7 +633,7 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac
*
* @param id The identifier for this notification as per
* {@link NotificationManager#notify(int, Notification)
- * NotificationManager.notify(int, Notification)}.
+ * NotificationManager.notify(int, Notification)}; must not be 0.
* @param notification The Notification to be displayed.
*
* @see #stopForeground(boolean)