summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYu Ping Hu <yph@google.com>2013-03-21 18:49:55 -0700
committerYu Ping Hu <yph@google.com>2013-03-21 19:25:14 -0700
commit861c5c8c9e054a4562af44805c57f39e7121ca43 (patch)
tree54e84e954492dc2887c8e2f9811628bc6d52262a /src
parent5a3aebbd2dd8cdd4d7c1a76ce3085cd6a314c0d0 (diff)
downloadandroid_packages_apps_Email-861c5c8c9e054a4562af44805c57f39e7121ca43.tar.gz
android_packages_apps_Email-861c5c8c9e054a4562af44805c57f39e7121ca43.tar.bz2
android_packages_apps_Email-861c5c8c9e054a4562af44805c57f39e7121ca43.zip
Guard against potential NPE.
Change-Id: I379da1f478b1b1fd1e488dbeff249cc10e3d48d5
Diffstat (limited to 'src')
-rw-r--r--src/com/android/email/service/EmailServiceStub.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/email/service/EmailServiceStub.java b/src/com/android/email/service/EmailServiceStub.java
index 631653c4f..79eeeb33a 100644
--- a/src/com/android/email/service/EmailServiceStub.java
+++ b/src/com/android/email/service/EmailServiceStub.java
@@ -525,7 +525,9 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
// 3. loop through the available messages and send them
while (c.moveToNext()) {
long messageId = -1;
- moveToSentValues.remove(EmailContent.MessageColumns.FLAGS);
+ if (moveToSentValues != null) {
+ moveToSentValues.remove(EmailContent.MessageColumns.FLAGS);
+ }
try {
messageId = c.getLong(0);
// Don't send messages with unloaded attachments