PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable Enhanced notifications setting when default NAS is not available

Browse Source 
Test: NotificationAssistantPreferenceControllerTest
Bug: 251400808
Change-Id: Idec520013bea32cfaea0285f33c525a6e37f0124
(cherry picked from commit 873b8544e1)
This commit is contained in:
Chloris Kuo
2022-10-12 11:05:25 -07:00
parent 7f6c833b89
commit 236eaed326
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/notification/NotificationAssistantPreferenceController.java
View File

@@ -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

10
tests/robotests/src/com/android/settings/notification/NotificationAssistantPreferenceControllerTest.java
View File

@@ -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());
}
}