diff options
| author | Makoto Onuki <omakoto@google.com> | 2014-07-10 15:32:16 -0700 |
|---|---|---|
| committer | Makoto Onuki <omakoto@google.com> | 2014-07-11 17:34:55 +0000 |
| commit | a2295e65dc0735beee32180ab51b9c0b198287e1 (patch) | |
| tree | 642775407c894e0b0f8a3fb2c88a711945d0c099 /core/java/android/provider | |
| parent | e00c0c672ea4a634fb5a638f8b297f840d20b616 (diff) | |
| download | frameworks_base-a2295e65dc0735beee32180ab51b9c0b198287e1.zip frameworks_base-a2295e65dc0735beee32180ab51b9c0b198287e1.tar.gz frameworks_base-a2295e65dc0735beee32180ab51b9c0b198287e1.tar.bz2 | |
Enterprise caller-id: framework/base/Telephony
It's basically equivalent to http://ag/500455 and http://ag/499160.
Now "Send to voicemail" and the missed call notification uses the enterprise
lookup; they now work with a corp contact too.
Bug 15779911
Change-Id: I8a87f45ba7299cfbc516eb44326e02258e38cf63
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/CallLog.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java index 760f2a5..c6b6e20 100644 --- a/core/java/android/provider/CallLog.java +++ b/core/java/android/provider/CallLog.java @@ -408,7 +408,7 @@ public class CallLog { values.put(CACHED_NUMBER_LABEL, ci.numberLabel); } - if ((ci != null) && (ci.person_id > 0)) { + if ((ci != null) && (ci.contactIdOrZero > 0)) { // Update usage information for the number associated with the contact ID. // We need to use both the number and the ID for obtaining a data ID since other // contacts may have the same number. @@ -422,7 +422,8 @@ public class CallLog { cursor = resolver.query(Phone.CONTENT_URI, new String[] { Phone._ID }, Phone.CONTACT_ID + " =? AND " + Phone.NORMALIZED_NUMBER + " =?", - new String[] { String.valueOf(ci.person_id), normalizedPhoneNumber}, + new String[] { String.valueOf(ci.contactIdOrZero), + normalizedPhoneNumber}, null); } else { final String phoneNumber = ci.phoneNumber != null ? ci.phoneNumber : number; @@ -431,7 +432,7 @@ public class CallLog { Uri.encode(phoneNumber)), new String[] { Phone._ID }, Phone.CONTACT_ID + " =?", - new String[] { String.valueOf(ci.person_id) }, + new String[] { String.valueOf(ci.contactIdOrZero) }, null); } |