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

Commit 236eaed3 authored Oct 12, 2022 by Chloris Kuo

Disable Enhanced notifications setting when default NAS is not available

Test: NotificationAssistantPreferenceControllerTest
Bug: 251400808
Change-Id: Idec520013bea32cfaea0285f33c525a6e37f0124
(cherry picked from commit 873b8544)

parent 7f6c833b

src/com/android/settings/notification/NotificationAssistantPreferenceController.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,10 @@ public class NotificationAssistantPreferenceController extends TogglePreferenceC
		@Override
		public void updateState(Preference preference) {
		super.updateState(preference);
		if (isNASSettingActivityAvailable()) {
		if (mDefaultNASComponent == null) {
		preference.setEnabled(false);
		((PrimarySwitchPreference) preference).setSwitchEnabled(false);
		} else if (isNASSettingActivityAvailable()) {
		preference.setIntent(mNASSettingIntent);
		} else {
		// Cannot find settings activity from the default NAS app

tests/robotests/src/com/android/settings/notification/NotificationAssistantPreferenceControllerTest.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -226,4 +226,14 @@ public class NotificationAssistantPreferenceControllerTest {
		.setNASMigrationDoneAndResetDefault(eq(10), anyBoolean());
		}

		@Test
		public void testNASUnavailable_settingDisabled() throws Exception {
		when(mBackend.getDefaultNotificationAssistant()).thenReturn(null);
		mPreferenceController.getDefaultNASIntent();
		mPreferenceController.updateState(mPreference);

		verify(mPreference, times(1)).setSwitchEnabled(eq(false));
		assertFalse(mPreference.isEnabled());
		}

		}