commit 7ae4b0bbdc9395c7ef72bfb5bf4fc053c891d4c2
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 22 15:36:22 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 22 15:36:22 2018 +0000
tree d6fedd7043602d4c9d49be7e4dc84ec20bb4eac2
parent 25fc14c6075d7c96fca3a12bf0e439087db181b9
parent 306e2d9f84450a5f16c9b4bcdee3affca5d575bb

Merge "Don't reset channel field when loading the app" into pi-dev

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

diff --git a/src/com/android/settings/notification/BlockPreferenceController.java b/src/com/android/settings/notification/BlockPreferenceController.java
index 7c6201e..5e56852 100644
--- a/src/com/android/settings/notification/BlockPreferenceController.java
+++ b/src/com/android/settings/notification/BlockPreferenceController.java
@@ -103,8 +103,10 @@
                 saveChannel();
             }
             if (mBackend.onlyHasDefaultChannel(mAppRow.pkg, mAppRow.uid)) {
-                mAppRow.banned = blocked;
-                mBackend.setNotificationsEnabledForPackage(mAppRow.pkg, mAppRow.uid, !blocked);
+                if (mAppRow.banned != blocked) {
+                    mAppRow.banned = blocked;
+                    mBackend.setNotificationsEnabledForPackage(mAppRow.pkg, mAppRow.uid, !blocked);
+                }
             }
         } else if (mChannelGroup != null) {
             mChannelGroup.setBlocked(blocked);

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

diff --git a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
index fbc9689..a13946e 100644
--- a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
@@ -250,8 +250,7 @@
 
         verify(mBackend, times(2)).updateChannel(any(), anyInt(), any());
 
-        // 2 calls for onSwitchChanged + once when calling updateState originally
-        verify(mBackend, times(3)).setNotificationsEnabledForPackage(
+        verify(mBackend, times(2)).setNotificationsEnabledForPackage(
                 anyString(), anyInt(), anyBoolean());
     }