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

Merge "Try to find cause for NPE" into jb-ub-mail

Browse Source
This commit is contained in:
Marc Blank 2012-08-17 13:42:11 -07:00 committed by Android (Google) Code Review
commit 0bac607eff
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/email/provider/EmailProvider.java
View File

@ -2333,10 +2333,12 @@ outer:
// First look at values; this is an override of default behavior // First look at values; this is an override of default behavior
if (values.containsKey(column)) { if (values.containsKey(column)) {
String value = values.getAsString(column); String value = values.getAsString(column);
if (value.startsWith("@")) { if (value == null) {
throw new IllegalArgumentException("Null value in " + column);
} else if (value.startsWith("@")) {
val = value.substring(1) + " AS " + column; val = value.substring(1) + " AS " + column;
} else { } else {
val = "'" + values.getAsString(column) + "' AS " + column; val = "'" + value + "' AS " + column;
} }
} else { } else {
// Now, get the standard value for the column from our projection map // Now, get the standard value for the column from our projection map