From 163323294e20f620931ae531cc927ae3932cb368 Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Thu, 22 May 2014 13:21:55 -0700
Subject: [PATCH] Change IEmailService.sync to have two different forms

Change-Id: Id8e770154d6116b02746cbdfb8c7cdc9358398de
---
 .../emailcommon/service/EmailServiceProxy.java       | 12 +++++++++---
 .../android/emailcommon/service/IEmailService.aidl   |  5 ++++-
 src/com/android/email/service/EmailServiceStub.java  |  8 ++++++--
 src/com/android/email/service/EmailServiceUtils.java |  9 +++++++--
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java b/emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java
index e10fee5b6..1658146c7 100644
--- a/emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java
+++ b/emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java
@@ -25,7 +25,9 @@ import android.os.RemoteException;
 import com.android.emailcommon.Device;
 import com.android.emailcommon.TempDirectory;
 import com.android.emailcommon.mail.MessagingException;
+import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.HostAuth;
+import com.android.emailcommon.provider.Mailbox;
 import com.android.emailcommon.provider.Policy;
 import com.android.mail.utils.LogUtils;
 
@@ -330,9 +332,13 @@ public class EmailServiceProxy extends ServiceProxy implements IEmailService {
         }, "sendMail");
     }
 
-        @Override
-        public void sync(final long accountId, final boolean updateFolderList,
-                final int mailboxType, final long[] folders) {}
+    @Override
+    public void syncFolders(final long accountId, final boolean updateFolderList,
+                     final long[] folders) {}
+
+    @Override
+    public void syncMailboxType(final long accountId, final boolean updateFolderList,
+                     final int mailboxType) {}
 
     @Override
     public IBinder asBinder() {
diff --git a/emailcommon/src/com/android/emailcommon/service/IEmailService.aidl b/emailcommon/src/com/android/emailcommon/service/IEmailService.aidl
index 7b9b4f4e7..a5a10872a 100644
--- a/emailcommon/src/com/android/emailcommon/service/IEmailService.aidl
+++ b/emailcommon/src/com/android/emailcommon/service/IEmailService.aidl
@@ -32,7 +32,9 @@ interface IEmailService {
             boolean background);
     oneway void updateFolderList(long accountId);
 
-    void sync(long accountId, boolean updateFolderList, int mailboxType, in long[] foldersToSync);
+    void syncFolders(long accountId, boolean updateFolderList, in long[] foldersToSync);
+
+    void syncMailboxType(long accountId, boolean updateFolderList, int mailboxType);
 
     // Push-related functionality.
 
@@ -43,6 +45,7 @@ interface IEmailService {
     // TODO: Decouple this call from HostAuth (i.e. use a dedicated data structure, or just pass
     // the necessary strings directly).
     Bundle validate(in HostAuth hostauth);
+
     int searchMessages(long accountId, in SearchParams params, long destMailboxId);
 
     // PIM functionality (not strictly EAS specific).
diff --git a/src/com/android/email/service/EmailServiceStub.java b/src/com/android/email/service/EmailServiceStub.java
index cc7a3bfbe..c0c668ea0 100644
--- a/src/com/android/email/service/EmailServiceStub.java
+++ b/src/com/android/email/service/EmailServiceStub.java
@@ -398,8 +398,12 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
     }
 
     @Override
-    public void sync(final long accountId, final boolean updateFolderList,
-            final int mailboxType, final long[] folders) {}
+    public void syncFolders(final long accountId, final boolean updateFolderList,
+                     final long[] folders) {}
+
+    @Override
+    public void syncMailboxType(final long accountId, final boolean updateFolderList,
+                     final int mailboxType) {}
 
     @Override
     public void sendMail(long accountId) throws RemoteException {
diff --git a/src/com/android/email/service/EmailServiceUtils.java b/src/com/android/email/service/EmailServiceUtils.java
index 7fb0e7dfc..00914b72c 100644
--- a/src/com/android/email/service/EmailServiceUtils.java
+++ b/src/com/android/email/service/EmailServiceUtils.java
@@ -698,8 +698,13 @@ public class EmailServiceUtils {
         }
 
         @Override
-        public void sync(final long accountId, final boolean updateFolderList,
-                final int mailboxType, final long[] folders) {
+        public void syncFolders(final long accountId, final boolean updateFolderList,
+                         final long[] folders) {
+        }
+
+        @Override
+        public void syncMailboxType(final long accountId, final boolean updateFolderList,
+                         final int mailboxType) {
         }
 
     }