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

Merge "Handle case of typed data with a null type" into froyo

Browse Source
This commit is contained in:
Marc Blank 2010-03-29 11:54:54 -07:00 committed by Android (Google) Code Review
commit e675d99cc2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/exchange/adapter/ContactsSyncAdapter.java
View File

@ -1017,7 +1017,10 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
} }
// Note Email.TYPE could be ANY type column; they are all defined in // Note Email.TYPE could be ANY type column; they are all defined in
// the private CommonColumns class in ContactsContract // the private CommonColumns class in ContactsContract
} else if (type < 0 || cv.getAsInteger(Email.TYPE) == type) { // We'll accept either type < 0 (don't care), cv doesn't have a type,
// or the types are equal
} else if (type < 0 || !cv.containsKey(Email.TYPE) ||
cv.getAsInteger(Email.TYPE) == type) {
result = namedContentValues; result = namedContentValues;
} }
} }