diff options
| author | Dmitri Plotnikov <dplotnikov@google.com> | 2009-10-20 17:54:18 -0700 |
|---|---|---|
| committer | Dmitri Plotnikov <dplotnikov@google.com> | 2009-10-20 17:54:29 -0700 |
| commit | bf00093267bb0d455e736dd2f1dea7236649c7cd (patch) | |
| tree | 1a30b5ccba8a79d1c04a5c0bf0f5d9484375030e | |
| parent | e40e5c0b4e93bea088edae29000a1b946fad8310 (diff) | |
| download | ContactsProvider-bf00093267bb0d455e736dd2f1dea7236649c7cd.tar.gz | |
Fixing the handling of Contact Join Suggestions URI.
Bug description:
If the join suggestions URI came from a source without restricted data
access and the suggestions included a restricted contact, we would get
an exception from ReorderingCursorWrapper, basically saying: I expected
N suggestions, but I only got N-K (where K is the number of restricted
suggestions).
The fix makes sure the restricted suggestions are excluded early enough
to keep the reordering cursor wrapper happy.
Bug: http://b/2179486
Change-Id: I5d1268e063cdd7b15d74aff0c8556d4614eddfdb
| -rw-r--r-- | src/com/android/providers/contacts/ContactAggregator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/providers/contacts/ContactAggregator.java b/src/com/android/providers/contacts/ContactAggregator.java index b983fe7a..4475a835 100644 --- a/src/com/android/providers/contacts/ContactAggregator.java +++ b/src/com/android/providers/contacts/ContactAggregator.java @@ -1552,7 +1552,7 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator // Run a query and find ids of best matching contacts satisfying the filter (if any) HashSet<Long> foundIds = new HashSet<Long>(); - Cursor cursor = db.query(ContactIdQuery.TABLE, ContactIdQuery.COLUMNS, sb.toString(), + Cursor cursor = db.query(qb.getTables(), ContactIdQuery.COLUMNS, sb.toString(), null, null, null, null); try { while(cursor.moveToNext()) { |