Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Thread with no recipients getting created" into jb-dev

Browse Source
This commit is contained in:
Tom Taylor
2012-05-10 10:39:50 -07:00
committed by Android (Google) Code Review
parent ca90d6dad5 aad847cb0c
commit 747eeb4c4e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/com/google/android/mms/pdu/PduPersister.java
View File

@@ -1058,9 +1058,10 @@ public class PduPersister {
}
}
}
long threadId = Threads.getOrCreateThreadId(mContext, recipients);
values.put(Mms.THREAD_ID, threadId);
if (!recipients.isEmpty()) {
long threadId = Threads.getOrCreateThreadId(mContext, recipients);
values.put(Mms.THREAD_ID, threadId);
}
SqliteWrapper.update(mContext, mContentResolver, uri, values, null, null);
}
@@ -1299,7 +1300,6 @@ public class PduPersister {
}
HashSet<String> recipients = new HashSet<String>();
long threadId = DUMMY_THREAD_ID;
int msgType = pdu.getMessageType();
// Here we only allocate thread ID for M-Notification.ind,
// M-Retrieve.conf and M-Send.req.
@@ -1326,9 +1326,11 @@ public class PduPersister {
}
}
}
threadId = Threads.getOrCreateThreadId(mContext, recipients);
if (!recipients.isEmpty()) {
long threadId = Threads.getOrCreateThreadId(mContext, recipients);
values.put(Mms.THREAD_ID, threadId);
}
}
values.put(Mms.THREAD_ID, threadId);
// Save parts first to avoid inconsistent message is loaded
// while saving the parts.