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

am 0c550c34: Return "0" for unknown columns in UIProvider queries

Browse Source 
* commit '0c550c343fecaec3e04fba274d1ac08bd722d311':
  Return "0" for unknown columns in UIProvider queries
This commit is contained in:
Marc Blank 2012-01-12 13:51:51 -08:00 committed by Android Git Automerger
commit d81279f2f4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2708,7 +2708,6 @@ outer:
/**
* Support for UnifiedEmail below
*/
/**
* Mapping of UIProvider columns to EmailProvider columns for the message list (called the
* conversation list in UnifiedEmail)
@ -2804,7 +2803,13 @@ outer:
} else {
sb.append(',');
}
sb.append(map.get(column));
String val = map.get(column);
// If we don't have the column, be permissive, returning "0 AS <column>", and warn
if (val == null) {
Log.w(TAG, "UIProvider column not found, returning 0: " + column);
val = "0 AS " + column;
}
sb.append(val);
}
return sb;
}