commit a93ef7712877a1199a9186039fb9323f5b5306d9
author Tom Taylor <tomtaylor@google.com> Fri Aug 02 17:59:03 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 02 17:59:03 2013 -0700
tree 2469fb5d701118c4bb87730d0356575a8d9f4f99
parent 7e7d8c9c6cc9f6aedd82dad01c2d2c8c76254dca
parent 027ef60275c764a123af94ade00b675dfaf46809

am 027ef602: Merge "addr.msg_id is the foreign key of the pdu._id"

* commit '027ef60275c764a123af94ade00b675dfaf46809':
  addr.msg_id is the foreign key of the pdu._id

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

diff --git a/src/com/android/providers/telephony/MmsSmsProvider.java b/src/com/android/providers/telephony/MmsSmsProvider.java
index ea0e39e..a15335f 100644
--- a/src/com/android/providers/telephony/MmsSmsProvider.java
+++ b/src/com/android/providers/telephony/MmsSmsProvider.java
@@ -947,12 +947,12 @@
      * Use this query:
      *
      * SELECT ...
-     *   FROM pdu, (SELECT _id AS address_id
+     *   FROM pdu, (SELECT msg_id AS address_msg_id
      *              FROM addr
      *              WHERE (address='<phoneNumber>' OR
      *              PHONE_NUMBERS_EQUAL(addr.address, '<phoneNumber>', 1/0)))
      *             AS matching_addresses
-     *   WHERE pdu._id = matching_addresses.address_id
+     *   WHERE pdu._id = matching_addresses.address_msg_id
      * UNION
      * SELECT ...
      *   FROM sms
@@ -965,7 +965,7 @@
         String finalMmsSelection =
                 concatSelections(
                         selection,
-                        "pdu._id = matching_addresses.address_id");
+                        "pdu._id = matching_addresses.address_msg_id");
         String finalSmsSelection =
                 concatSelections(
                         selection,
@@ -979,7 +979,7 @@
         smsQueryBuilder.setDistinct(true);
         mmsQueryBuilder.setTables(
                 MmsProvider.TABLE_PDU +
-                ", (SELECT _id AS address_id " +
+                ", (SELECT msg_id AS address_msg_id " +
                 "FROM addr WHERE (address=" + escapedPhoneNumber +
                 " OR PHONE_NUMBERS_EQUAL(addr.address, " +
                 escapedPhoneNumber +