summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2021-10-13 21:02:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-13 21:02:03 +0000
commitf01bf6d8bf54f203d351f82249041ec583ae463d (patch)
tree370393d8f2df5f379591181f5b1ccb2d206095f1 /core/java
parentd775b018d1c83c7b799f345a1b342d2c18228993 (diff)
parent89dac6d111d9107058a25e40ee6170a651a7d646 (diff)
Merge "Fix incorrect documentation" into sc-v2-dev am: 64ef6abce8 am: 89dac6d111
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15949163 Change-Id: I11c6dc3bbf60341e6d886c19adbaf7298eea2a4c
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/service/notification/NotificationListenerService.java9
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;
* &lt;/intent-filter>
* &lt;meta-data
* android:name="android.service.notification.default_filter_types"
- * android:value="conversations,alerting">
+ * android:value="conversations|alerting">
* &lt;/meta-data>
* &lt;meta-data
* android:name="android.service.notification.disabled_filter_types"
- * android:value="ongoing,silent">
+ * android:value="ongoing|silent">
* &lt;/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}.