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

Don't reset channel field when loading the app

Browse Source 
Only save data that's changed.

Change-Id: Iaa8265f543a7c1ec418d9d016986e0a253f28df6
Fixes: 79216856
Test: robo tests
This commit is contained in:
Julia Reynolds
2018-05-22 09:07:46 -04:00
parent 5c99a41a9c
commit 306e2d9f84
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/notification/BlockPreferenceController.java
View File

@@ -103,8 +103,10 @@ public class BlockPreferenceController extends NotificationPreferenceController
saveChannel(); saveChannel();
} }
if (mBackend.onlyHasDefaultChannel(mAppRow.pkg, mAppRow.uid)) { if (mBackend.onlyHasDefaultChannel(mAppRow.pkg, mAppRow.uid)) {
mAppRow.banned = blocked; if (mAppRow.banned != blocked) {
mBackend.setNotificationsEnabledForPackage(mAppRow.pkg, mAppRow.uid, !blocked); mAppRow.banned = blocked;
mBackend.setNotificationsEnabledForPackage(mAppRow.pkg, mAppRow.uid, !blocked);
}
} }
} else if (mChannelGroup != null) { } else if (mChannelGroup != null) {
mChannelGroup.setBlocked(blocked); mChannelGroup.setBlocked(blocked);

3
tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
View File

@@ -250,8 +250,7 @@ public class BlockPreferenceControllerTest {
verify(mBackend, times(2)).updateChannel(any(), anyInt(), any()); verify(mBackend, times(2)).updateChannel(any(), anyInt(), any());
// 2 calls for onSwitchChanged + once when calling updateState originally verify(mBackend, times(2)).setNotificationsEnabledForPackage(
verify(mBackend, times(3)).setNotificationsEnabledForPackage(
anyString(), anyInt(), anyBoolean()); anyString(), anyInt(), anyBoolean());
} }