drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use callable-filter capability when updating call log" into jb-dev

Browse Source
This commit is contained in:
Daisuke Miyakawa
2012-05-07 10:46:26 -07:00
committed by Android (Google) Code Review
parent 9d7bbcb89a e23362a54d
commit cacba45993
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/provider/CallLog.java
View File

@ -25,6 +25,7 @@ import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.provider.ContactsContract.CommonDataKinds.Callable;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.DataUsageFeedback;
import android.text.TextUtils;
@ -312,10 +313,12 @@ public class CallLog {
null);
} else {
final String phoneNumber = ci.phoneNumber != null ? ci.phoneNumber : number;
cursor = resolver.query(Phone.CONTENT_URI,
cursor = resolver.query(
Uri.withAppendedPath(Callable.CONTENT_FILTER_URI,
Uri.encode(phoneNumber)),
new String[] { Phone._ID },
Phone.CONTACT_ID + " =? AND " + Phone.NUMBER + " =?",
new String[] { String.valueOf(ci.person_id), phoneNumber},
Phone.CONTACT_ID + " =?",
new String[] { String.valueOf(ci.person_id) },
null);
}