From 1d5485916802e76d9f2513c462eb658344ed8050 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Thu, 20 Oct 2022 14:53:46 -0400 Subject: [PATCH] Update category to intent action Test: settings unit tests Bug: 254339351 Change-Id: I6c4bfb474408cd9ab95ae3fbd80a89760a4b7844 --- .../MoreSettingsPreferenceController.java | 4 +--- .../MoreSettingsPreferenceControllerTest.java | 11 ++++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/MoreSettingsPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/MoreSettingsPreferenceController.java index a1ae3a4eef9..a8bafc900e1 100644 --- a/src/com/android/settings/applications/specialaccess/notificationaccess/MoreSettingsPreferenceController.java +++ b/src/com/android/settings/applications/specialaccess/notificationaccess/MoreSettingsPreferenceController.java @@ -38,9 +38,7 @@ public class MoreSettingsPreferenceController extends BasePreferenceController { PackageManager mPm; String mPackage; - int mUserId; - Intent mIntent = new Intent(Intent.ACTION_MAIN) - .addCategory(NotificationListenerService.INTENT_CATEGORY_SETTINGS_HOME); + Intent mIntent = new Intent(NotificationListenerService.ACTION_SETTINGS_HOME); public MoreSettingsPreferenceController(Context context) { super(context, KEY_MORE_SETTINGS); diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/MoreSettingsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/MoreSettingsPreferenceControllerTest.java index 503af46846d..499a753ce87 100644 --- a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/MoreSettingsPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/MoreSettingsPreferenceControllerTest.java @@ -22,7 +22,6 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -73,9 +72,8 @@ public class MoreSettingsPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); assertThat(captor.getValue().getPackage()).isEqualTo(mPkg); - assertThat(captor.getValue().getAction()).isEqualTo(Intent.ACTION_MAIN); - assertThat(captor.getValue().getCategories()).contains( - NotificationListenerService.INTENT_CATEGORY_SETTINGS_HOME); + assertThat(captor.getValue().getAction()).contains( + NotificationListenerService.ACTION_SETTINGS_HOME); } @Test @@ -92,8 +90,7 @@ public class MoreSettingsPreferenceControllerTest { mController.updateState(preference); assertThat(preference.getIntent().getPackage()).isEqualTo(mPkg); - assertThat(preference.getIntent().getAction()).isEqualTo(Intent.ACTION_MAIN); - assertThat(preference.getIntent().getCategories()).contains( - NotificationListenerService.INTENT_CATEGORY_SETTINGS_HOME); + assertThat(preference.getIntent().getAction()).isEqualTo( + NotificationListenerService.ACTION_SETTINGS_HOME); } }