Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use | not ," into sc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2021-05-13 21:49:45 +00:00
committed by Android (Google) Code Review
parent 85eb43208f c51b18f835
commit 8bfb21bb8c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -9984,6 +9984,7 @@ public class NotificationManagerService extends SystemService {
static final String TAG_APPROVED = "allowed"; static final String TAG_APPROVED = "allowed";
static final String TAG_DISALLOWED= "disallowed"; static final String TAG_DISALLOWED= "disallowed";
static final String XML_SEPARATOR = ","; static final String XML_SEPARATOR = ",";
static final String FLAG_SEPARATOR = "\\|";
private final ArraySet<ManagedServiceInfo> mLightTrimListeners = new ArraySet<>(); private final ArraySet<ManagedServiceInfo> mLightTrimListeners = new ArraySet<>();
ArrayMap<Pair<ComponentName, Integer>, NotificationListenerFilter> ArrayMap<Pair<ComponentName, Integer>, NotificationListenerFilter>
@@ -10255,7 +10256,7 @@ public class NotificationManagerService extends SystemService {
private int getTypesFromStringList(String typeList) { private int getTypesFromStringList(String typeList) {
int types = 0; int types = 0;
if (typeList != null) { if (typeList != null) {
String[] typeStrings = typeList.split(XML_SEPARATOR); String[] typeStrings = typeList.split(FLAG_SEPARATOR);
for (int i = 0; i < typeStrings.length; i++) { for (int i = 0; i < typeStrings.length; i++) {
final String typeString = typeStrings[i]; final String typeString = typeStrings[i];
if (TextUtils.isEmpty(typeString)) { if (TextUtils.isEmpty(typeString)) {

10
services/tests/uiservicestests/src/com/android/server/notification/NotificationListenersTest.java
View File

@@ -197,7 +197,7 @@ public class NotificationListenersTest extends UiServiceTestCase {
si.packageName = "new"; si.packageName = "new";
si.name = "comp"; si.name = "comp";
si.metaData = new Bundle(); 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); mListeners.ensureFilters(si, 0);
@@ -213,7 +213,7 @@ public class NotificationListenersTest extends UiServiceTestCase {
si.name = "comp"; si.name = "comp";
si.metaData = new Bundle(); si.metaData = new Bundle();
si.metaData.putString(NotificationListenerService.META_DATA_DEFAULT_FILTER_TYPES, si.metaData.putString(NotificationListenerService.META_DATA_DEFAULT_FILTER_TYPES,
"conversations,ALERTING"); "conversations|ALERTING");
mListeners.ensureFilters(si, 0); mListeners.ensureFilters(si, 0);
@@ -243,7 +243,7 @@ public class NotificationListenersTest extends UiServiceTestCase {
si.packageName = "new"; si.packageName = "new";
si.name = "comp"; si.name = "comp";
si.metaData = new Bundle(); 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); mListeners.ensureFilters(si, 0);
@@ -259,7 +259,7 @@ public class NotificationListenersTest extends UiServiceTestCase {
si.name = "comp"; si.name = "comp";
si.metaData = new Bundle(); si.metaData = new Bundle();
si.metaData.putString(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES, si.metaData.putString(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES,
"1,alerting"); "1|alerting");
mListeners.ensureFilters(si, 0); mListeners.ensureFilters(si, 0);
@@ -274,7 +274,7 @@ public class NotificationListenersTest extends UiServiceTestCase {
si.packageName = "new"; si.packageName = "new";
si.name = "comp"; si.name = "comp";
si.metaData = new Bundle(); 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); si.metaData.putInt(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES, 1);
mListeners.ensureFilters(si, 0); mListeners.ensureFilters(si, 0);