Merge "Avoid expression tree depth error in removeUnferencedAddresses()" am: 0931c72127 am: e84d609247
am: df84a2311e
* commit 'df84a2311ef9144bb938ba9cee1c4ed6142f53f8':
Avoid expression tree depth error in removeUnferencedAddresses()
diff --git a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
index e763f35..f2d12d3 100644
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
@@ -267,15 +267,15 @@
// Now build a selection string of all the unique recipient ids
StringBuilder sb = new StringBuilder();
Iterator<Integer> iter = recipientIds.iterator();
+ sb.append("_id NOT IN (");
while (iter.hasNext()) {
- sb.append("_id != " + iter.next());
+ sb.append(iter.next());
if (iter.hasNext()) {
- sb.append(" AND ");
+ sb.append(",");
}
}
- if (sb.length() > 0) {
- int rows = db.delete("canonical_addresses", sb.toString(), null);
- }
+ sb.append(")");
+ int rows = db.delete("canonical_addresses", sb.toString(), null);
}
} finally {
c.close();