Merge "Fix incorrect documentation" into sc-v2-dev am: 64ef6abce8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15949163

Change-Id: I72c5b935b609b11c3b1ac3e1051537c9c6ae0876

1 files changed, 5 insertions, 4 deletions

diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java
index 71f90fd28e3f..3d18a8933153 100644
--- a/core/java/android/service/notification/NotificationListenerService.java
+++ b/core/java/android/service/notification/NotificationListenerService.java
@@ -83,11 +83,11 @@ import java.util.Objects;
  *     </intent-filter>
  *     <meta-data
  *               android:name="android.service.notification.default_filter_types"
- *               android:value="conversations,alerting">
+ *               android:value="conversations|alerting">
  *           </meta-data>
  *     <meta-data
  *               android:name="android.service.notification.disabled_filter_types"
- *               android:value="ongoing,silent">
+ *               android:value="ongoing|silent">
  *           </meta-data>
  * &lt;/service></pre>
  *
@@ -112,8 +112,9 @@ public abstract class NotificationListenerService extends Service {
     private final String TAG = getClass().getSimpleName();
 
     /**
-     * The name of the {@code meta-data} tag containing a comma separated list of default
-     * integer notification types that should be provided to this listener. See
+     * The name of the {@code meta-data} tag containing a pipe separated list of default
+     * integer notification types or "ongoing", "conversations", "alerting", or "silent"
+     * that should be provided to this listener. See
      * {@link #FLAG_FILTER_TYPE_ONGOING},
      * {@link #FLAG_FILTER_TYPE_CONVERSATIONS}, {@link #FLAG_FILTER_TYPE_ALERTING),
      * and {@link #FLAG_FILTER_TYPE_SILENT}.