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

Merge "Use | not ," into sc-dev am: 8bfb21bb8c

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

Change-Id: I62d2d9ed049f732a62da625a1ee5e11dd7a6d5e1
This commit is contained in:
Julia Reynolds
2021-05-13 22:05:54 +00:00
committed by Automerger Merge Worker
parent 3e4eb4bd4a 8bfb21bb8c
commit 0a2506112e
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

@@ -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<ManagedServiceInfo> mLightTrimListeners = new ArraySet<>();
ArrayMap<Pair<ComponentName, Integer>, 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)) {

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.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);