Merge "Fix account deletion when removing security policies." into ub-mail-master

emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java

@@ -375,6 +375,10 @@ public class EmailServiceProxy extends ServiceProxy implements IEmailService {
                 mService.deleteAccountPIMData(emailAddress);
             }
         }, "deleteAccountPIMData");
+        // This can be called when deleting accounts. After making this call, the caller will
+        // ask for account reconciliation, which will kill the processes. We wait for completion
+        // to avoid the race.
+        waitForCompletion();
     }
 
     /**

src/com/android/email/SecurityPolicy.java

@@ -32,6 +32,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.RemoteException;
 
+import com.android.email.provider.AccountReconciler;
 import com.android.email.provider.EmailProvider;
 import com.android.email.service.EmailBroadcastProcessorService;
 import com.android.email.service.EmailServiceUtils;
@@ -699,13 +700,14 @@ public class SecurityPolicy {
                     " secured account(s)");
             while (c.moveToNext()) {
                 long accountId = c.getLong(EmailContent.ID_PROJECTION_COLUMN);
-                Uri uri = EmailProvider.uiUri("uiaccountdata", accountId);
+                Uri uri = EmailProvider.uiUri("uiaccount", accountId);
                 cr.delete(uri, null, null);
             }
         } finally {
             c.close();
         }
         policiesUpdated();
+        AccountReconciler.reconcileAccounts(context);
     }
 
     /**

src/com/android/email/provider/EmailProvider.java

@@ -5501,6 +5501,8 @@ public class EmailProvider extends ContentProvider {
             AccountBackupRestore.backup(context);
             SecurityPolicy.getInstance(context).reducePolicies();
             MailActivityEmail.setServicesEnabledSync(context);
+            // TODO: We ought to reconcile accounts here, but some callers do this in a loop,
+            // which would be a problem when the first account reconciliation shuts us down.
             return 1;
         } catch (Exception e) {
             LogUtils.w(Logging.LOG_TAG, "Exception while deleting account", e);