Merge "Revert "Get rid of deleteAccountPIMData from IEmailService"" into ub-mail-master

3 files changed, 19 insertions, 3 deletions

diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 91bff7061..ce887766b 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -5954,10 +5954,17 @@ public class EmailProvider extends ContentProvider {
         cv.putNull(AccountColumns.SYNC_KEY);
         resolver.update(Account.CONTENT_URI, cv, Account.ID_SELECTION, accountIdArgs);
 
-        // Delete the account from the Android account manager.
-        // This will delete any contacts and calendar data, stop syncs, etc.
+        // Delete PIM data (contacts, calendar), stop syncs, etc. if applicable
         if (emailAddress != null) {
-            AccountReconciler.reconcileAccounts(context);
+            final IEmailService service =
+                    EmailServiceUtils.getServiceForAccount(context, accountId);
+            if (service != null) {
+                try {
+                    service.deleteAccountPIMData(emailAddress);
+                } catch (final RemoteException e) {
+                    // Can't do anything about this
+                }
+            }
         }
     }
 
diff --git a/src/com/android/email/service/EmailServiceStub.java b/src/com/android/email/service/EmailServiceStub.java
index f9d7e673b..cc7a3bfbe 100644
--- a/src/com/android/email/service/EmailServiceStub.java
+++ b/src/com/android/email/service/EmailServiceStub.java
@@ -381,6 +381,11 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
     }
 
     @Override
+    public void deleteAccountPIMData(final String emailAddress) throws RemoteException {
+        AccountReconciler.reconcileAccounts(mContext);
+    }
+
+    @Override
     public int searchMessages(long accountId, SearchParams params, long destMailboxId)
             throws RemoteException {
         // Not required
diff --git a/src/com/android/email/service/EmailServiceUtils.java b/src/com/android/email/service/EmailServiceUtils.java
index dd091867f..7fb0e7dfc 100644
--- a/src/com/android/email/service/EmailServiceUtils.java
+++ b/src/com/android/email/service/EmailServiceUtils.java
@@ -680,6 +680,10 @@ public class EmailServiceUtils {
         }
 
         @Override
+        public void deleteAccountPIMData(final String emailAddress) throws RemoteException {
+        }
+
+        @Override
         public int searchMessages(long accountId, SearchParams params, long destMailboxId)
                 throws RemoteException {
             return 0;