Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev

1 files changed, 5 insertions, 1 deletions

diff --git a/provider_src/com/android/email/service/EmailBroadcastProcessorService.java b/provider_src/com/android/email/service/EmailBroadcastProcessorService.java
index 3b15904d7..7aa54673e 100644
--- a/provider_src/com/android/email/service/EmailBroadcastProcessorService.java
+++ b/provider_src/com/android/email/service/EmailBroadcastProcessorService.java
@@ -40,13 +40,13 @@ import com.android.email.R;
 import com.android.email.SecurityPolicy;
 import com.android.email.provider.AccountReconciler;
 import com.android.emailcommon.Logging;
-import com.android.emailcommon.VendorPolicyLoader;
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.provider.EmailContent.AccountColumns;
 import com.android.emailcommon.provider.HostAuth;
 import com.android.mail.providers.UIProvider;
 import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.NotificationActionUtils;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
 
@@ -367,5 +367,9 @@ public class EmailBroadcastProcessorService extends IntentService {
     private void onSystemAccountChanged() {
         LogUtils.i(Logging.LOG_TAG, "System accounts updated.");
         reconcileAndStartServices();
+        // Resend all notifications, so that there is no notification that points to a removed
+        // account.
+        NotificationActionUtils.resendNotifications(getApplicationContext(),
+                null /* all accounts */, null /* all folders */);
     }
 }