am cadbc47f: am 4827f0bc: am f85d9e08: am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value." into ub-gmail-ur14-dev

* commit 'cadbc47f7963e8a36c91affb2fc5e23a3f36ccbf':
  Fix restoreBodySource key so it returns the correct value.
This commit is contained in:
Anthony Lee 2014-11-02 18:53:40 +00:00 committed by Android Git Automerger
commit 4018b9cc9e

View File

@ -493,9 +493,6 @@ public abstract class EmailContent {
public static final int CONTENT_SOURCE_KEY_COLUMN = 4;
public static final int CONTENT_QUOTED_TEXT_START_POS_COLUMN = 5;
private static final String[] PROJECTION_SOURCE_KEY =
new String[] {BaseColumns._ID, BodyColumns.SOURCE_MESSAGE_KEY};
public long mMessageKey;
public String mHtmlContent;
public String mTextContent;
@ -577,7 +574,7 @@ public abstract class EmailContent {
@VisibleForTesting
public static long restoreBodySourceKey(Context context, long messageId) {
return Utility.getFirstRowLong(context, Body.CONTENT_URI,
Body.PROJECTION_SOURCE_KEY,
new String[] {BodyColumns.SOURCE_MESSAGE_KEY},
BodyColumns.MESSAGE_KEY + "=?", new String[] {Long.toString(messageId)}, null,
0, 0L);
}