commit e861b4fb73f2bcad381c9d5a5666a05d59db68b5
author The Android Open Source Project <initial-contribution@android.com> Thu Apr 08 10:50:43 2010 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Apr 08 10:50:43 2010 -0700
tree 17ad03a9c56a3e29d7c5ec9b50626143f5338b8c
parent a882662df39eb5af84cc386fc09df4636166f48f
parent 21c25bcedfc36ff1ebe6082eef2fb4076fe636ac

merge from open-source master

Change-Id: Ie2616d4bbc9f1f545accbf043176b698e2e7dc3f

src/com/android/providers/telephony/MmsProvider.java

diff --git a/src/com/android/providers/telephony/MmsProvider.java b/src/com/android/providers/telephony/MmsProvider.java
index 5ddffe8..a4e6919 100644
--- a/src/com/android/providers/telephony/MmsProvider.java
+++ b/src/com/android/providers/telephony/MmsProvider.java
@@ -29,6 +29,7 @@
 import android.os.ParcelFileDescriptor;
 import android.provider.BaseColumns;
 import android.provider.Telephony;
+import android.provider.Telephony.CanonicalAddressesColumns;
 import android.provider.Telephony.Mms;
 import android.provider.Telephony.MmsSms;
 import android.provider.Telephony.Mms.Addr;
@@ -43,6 +44,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import android.provider.Telephony.Threads;
 
 /**
  * The class to provide base facility to access MMS related content,
@@ -344,6 +346,14 @@
                 finalValues.put(Mms.READ, 1);
             }
 
+            // thread_id
+            Long threadId = values.getAsLong(Mms.THREAD_ID);
+            String address = values.getAsString(CanonicalAddressesColumns.ADDRESS);
+
+            if (((threadId == null) || (threadId == 0)) && (address != null)) {
+                finalValues.put(Mms.THREAD_ID, Threads.getOrCreateThreadId(getContext(), address));
+            }
+
             if ((rowId = db.insert(table, null, finalValues)) <= 0) {
                 Log.e(TAG, "MmsProvider.insert: failed! " + finalValues);
                 return null;