From 78c4e70cf6545bd0526acec31a5a48468e3f5229 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Thu, 13 May 2021 15:13:36 -0400 Subject: [PATCH] Use | not , To match similar APIs Test: Settings unit Bug: 181175697 Change-Id: I2ef56528da7a3d5b2c96be8ecfad1a3d6590bbe4 --- .../notificationaccess/TypeFilterPreferenceController.java | 4 ++-- .../TypeFilterPreferenceControllerTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java index 635d2ddaaff..973fba7740e 100644 --- a/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java +++ b/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java @@ -40,7 +40,7 @@ public abstract class TypeFilterPreferenceController extends BasePreferenceContr PreferenceControllerMixin, Preference.OnPreferenceChangeListener { private static final String TAG = "TypeFilterPrefCntlr"; - private static final String XML_SEPARATOR = ","; + private static final String FLAG_SEPARATOR = "\\|"; private ComponentName mCn; private int mUserId; @@ -132,7 +132,7 @@ public abstract class TypeFilterPreferenceController extends BasePreferenceContr NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES).toString(); if (typeList != null) { int types = 0; - 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/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java index 3f6103a81a9..0e73cc3d548 100644 --- a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java @@ -152,7 +152,7 @@ public class TypeFilterPreferenceControllerTest { public void updateState_enabled_metaData_disableFilter_notThisField() { mSi.metaData = new Bundle(); mSi.metaData.putCharSequence(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES, - "1,alerting"); + "1|alerting"); when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true); when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter()); CheckBoxPreference pref = new CheckBoxPreference(mContext); @@ -165,7 +165,7 @@ public class TypeFilterPreferenceControllerTest { public void updateState_enabled_metaData_disableFilter_thisField_stateIsChecked() { mSi.metaData = new Bundle(); mSi.metaData.putCharSequence(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES, - "conversations,2,32"); + "conversations|2|32"); when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true); when(mNm.getListenerFilter(mCn, 0)).thenReturn( new NotificationListenerFilter(32, new ArraySet<>())); @@ -189,7 +189,7 @@ public class TypeFilterPreferenceControllerTest { public void updateState_disabled_metaData_disableFilter_thisField_stateIsNotChecked() { mSi.metaData = new Bundle(); mSi.metaData.putCharSequence(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES, - "1,2,32"); + "1|2|32"); when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true); NotificationListenerFilter before = new NotificationListenerFilter(4, new ArraySet<>()); when(mNm.getListenerFilter(mCn, 0)).thenReturn(before);