ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge change 20888

Browse Source 
* changes:
  Fixes re: CL20440, per stadler's comments
This commit is contained in:
Android (Google) Code Review 2009-08-12 09:15:52 -07:00
commit 20583edef6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/exchange/adapter/FolderSyncParser.java
View File

@ -303,7 +303,7 @@ public class FolderSyncParser extends Parser {
// Finally, we execute the batch // Finally, we execute the batch
try { try {
mService.mContext.getContentResolver() mService.mContext.getContentResolver()
.applyBatch(EmailProvider.EMAIL_AUTHORITY, ops); .applyBatch(EmailProvider.EMAIL_AUTHORITY, ops);
mService.userLog("New Account SyncKey: " + mAccount.mSyncKey); mService.userLog("New Account SyncKey: " + mAccount.mSyncKey);
} catch (RemoteException e) { } catch (RemoteException e) {
// There is nothing to be done here; fail by returning null // There is nothing to be done here; fail by returning null
@ -315,8 +315,9 @@ public class FolderSyncParser extends Parser {
// I'm not aware of any other way to deal with this properly // I'm not aware of any other way to deal with this properly
mBindArguments[0] = "Sync Issues"; mBindArguments[0] = "Sync Issues";
mBindArguments[1] = mAccountIdAsString; mBindArguments[1] = mAccountIdAsString;
Cursor c = mContentResolver.query(Mailbox.CONTENT_URI, MAILBOX_ID_COLUMNS_PROJECTION, Cursor c = mContentResolver.query(Mailbox.CONTENT_URI,
WHERE_DISPLAY_NAME_AND_ACCOUNT, mBindArguments, null); MAILBOX_ID_COLUMNS_PROJECTION, WHERE_DISPLAY_NAME_AND_ACCOUNT,
mBindArguments, null);
String parentServerId = null; String parentServerId = null;
long id = 0; long id = 0;
try { try {