diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 3fcf54baf10e6..be709e226a2e0 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -9986,6 +9986,7 @@ public class NotificationManagerService extends SystemService { static final String TAG_APPROVED = "allowed"; static final String TAG_DISALLOWED= "disallowed"; static final String XML_SEPARATOR = ","; + static final String FLAG_SEPARATOR = "\\|"; private final ArraySet mLightTrimListeners = new ArraySet<>(); ArrayMap, NotificationListenerFilter> @@ -10257,7 +10258,7 @@ public class NotificationManagerService extends SystemService { private int getTypesFromStringList(String typeList) { int types = 0; if (typeList != null) { - String[] typeStrings = typeList.split(XML_SEPARATOR); + String[] typeStrings = typeList.split(FLAG_SEPARATOR); for (int i = 0; i < typeStrings.length; i++) { final String typeString = typeStrings[i]; if (TextUtils.isEmpty(typeString)) { diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenersTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenersTest.java index ab545266466e3..50ebffc31035f 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenersTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenersTest.java @@ -197,7 +197,7 @@ public class NotificationListenersTest extends UiServiceTestCase { si.packageName = "new"; si.name = "comp"; si.metaData = new Bundle(); - si.metaData.putString(NotificationListenerService.META_DATA_DEFAULT_FILTER_TYPES, "1,2"); + si.metaData.putString(NotificationListenerService.META_DATA_DEFAULT_FILTER_TYPES, "1|2"); mListeners.ensureFilters(si, 0); @@ -213,7 +213,7 @@ public class NotificationListenersTest extends UiServiceTestCase { si.name = "comp"; si.metaData = new Bundle(); si.metaData.putString(NotificationListenerService.META_DATA_DEFAULT_FILTER_TYPES, - "conversations,ALERTING"); + "conversations|ALERTING"); mListeners.ensureFilters(si, 0); @@ -243,7 +243,7 @@ public class NotificationListenersTest extends UiServiceTestCase { si.packageName = "new"; si.name = "comp"; si.metaData = new Bundle(); - si.metaData.putString(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES, "1,2"); + si.metaData.putString(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES, "1|2"); mListeners.ensureFilters(si, 0); @@ -259,7 +259,7 @@ public class NotificationListenersTest extends UiServiceTestCase { si.name = "comp"; si.metaData = new Bundle(); si.metaData.putString(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES, - "1,alerting"); + "1|alerting"); mListeners.ensureFilters(si, 0); @@ -274,7 +274,7 @@ public class NotificationListenersTest extends UiServiceTestCase { si.packageName = "new"; si.name = "comp"; si.metaData = new Bundle(); - si.metaData.putString(NotificationListenerService.META_DATA_DEFAULT_FILTER_TYPES, "1,2"); + si.metaData.putString(NotificationListenerService.META_DATA_DEFAULT_FILTER_TYPES, "1|2"); si.metaData.putInt(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES, 1); mListeners.ensureFilters(si, 0);