diff options
| author | Tom Marshall <tdm@cyngn.com> | 2015-03-12 21:07:21 -0700 |
|---|---|---|
| committer | Tom Marshall <tdm@cyngn.com> | 2015-03-12 21:07:21 -0700 |
| commit | ebaa41f541f99745b5b4884cbe6c71123ec3c3ba (patch) | |
| tree | 156e860c9f1062f25a2af9cf74d28a2daad910e7 /emailcommon/src/com/android/emailcommon/provider/EmailContent.java | |
| parent | 8c50ed4589a5cd8f0e9be40ee0cfe71adbd61b10 (diff) | |
| parent | a2acc75c6bd263b97656ea8410568e7d38b4040c (diff) | |
| download | android_packages_apps_Email-ebaa41f541f99745b5b4884cbe6c71123ec3c3ba.tar.gz android_packages_apps_Email-ebaa41f541f99745b5b4884cbe6c71123ec3c3ba.tar.bz2 android_packages_apps_Email-ebaa41f541f99745b5b4884cbe6c71123ec3c3ba.zip | |
Merge tag 'android-5.1.0_r1' into merge-5.1staging/cm-12.1
Android 5.1.0 release 1
Conflicts:
provider_src/com/android/email/provider/AccountReconciler.java
provider_src/com/android/email/provider/EmailProvider.java
Change-Id: I5b67dce2cbafd7899202c461c607a4fc412d8e62
Diffstat (limited to 'emailcommon/src/com/android/emailcommon/provider/EmailContent.java')
| -rwxr-xr-x | emailcommon/src/com/android/emailcommon/provider/EmailContent.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java index 4b2f7b73d..f1fcb0dcf 100755 --- a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java +++ b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java @@ -35,10 +35,10 @@ import android.os.Parcelable; import android.os.RemoteException; import android.provider.BaseColumns; -import com.android.emailcommon.utility.TextUtilities; -import com.android.emailcommon.utility.Utility; import com.android.emailcommon.Logging; import com.android.emailcommon.R; +import com.android.emailcommon.utility.TextUtilities; +import com.android.emailcommon.utility.Utility; import com.android.mail.providers.UIProvider; import com.android.mail.utils.LogUtils; import com.google.common.annotations.VisibleForTesting; @@ -96,9 +96,12 @@ public abstract class EmailContent { public static final int SYNC_STATUS_USER = UIProvider.SyncStatus.USER_REFRESH; public static final int SYNC_STATUS_BACKGROUND = UIProvider.SyncStatus.BACKGROUND_SYNC; public static final int SYNC_STATUS_LIVE = UIProvider.SyncStatus.LIVE_QUERY; + public static final int SYNC_STATUS_INITIAL_SYNC_NEEDED = + UIProvider.SyncStatus.INITIAL_SYNC_NEEDED; public static final int LAST_SYNC_RESULT_SUCCESS = UIProvider.LastSyncResult.SUCCESS; public static final int LAST_SYNC_RESULT_AUTH_ERROR = UIProvider.LastSyncResult.AUTH_ERROR; + public static final int LAST_SYNC_RESULT_SERVER_ERROR = UIProvider.LastSyncResult.SERVER_ERROR; public static final int LAST_SYNC_RESULT_SECURITY_ERROR = UIProvider.LastSyncResult.SECURITY_ERROR; public static final int LAST_SYNC_RESULT_CONNECTION_ERROR = @@ -491,9 +494,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; @@ -575,7 +575,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); } |