Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a250611 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I62d2d9ed049f732a62da625a1ee5e11dd7a6d5e1
parents 3e4eb4bd 8bfb21bb
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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)) {
+5 −5
Original line number Diff line number Diff line
@@ -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);