Commit Graph

23 Commits

Author SHA1 Message Date
David Brown
1cc52df752 am 4c11eee7: am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().
* commit '4c11eee7ec3dafe943af7f4222e29b550163e58c':
  Reduce the outrageous verbosity of CallerInfo.toString().
2010-12-01 09:21:22 -08:00
David Brown
a4d785688c am b9c19be7: am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
* commit 'b9c19be7c198dcdac7a37ea4af901af5179933d9':
  Fix bug 3121292: Contact photo not shown correctly for SIP calls
2010-12-01 09:20:58 -08:00
David Brown
04639ba0a9 Reduce the outrageous verbosity of CallerInfo.toString().
Bug: 3121292
Change-Id: Ia8383891ef29a003acbd627b25ce87a187ef95c0
2010-11-30 15:49:48 -08:00
David Brown
85e0ff8f3d Fix bug 3121292: Contact photo not shown correctly for SIP calls
The problem was that when we did a contact lookup based on a SIP address,
the resulting CallerInfo object did not have the person_id field set
correctly.  That meant we had no way to look up the photo for that person.

This was because of a missing case in the logic to determine which column
(in the resulting cursor) to use for the person_id lookup.  We were
handling lookups fine in the PhoneLookup and Phone tables, but were
missing a case for direct lookups in the Data table (which is how we look
up SIP addresses.)

The fix is to add a case for URIs like
"content://com.android.contacts/data" when looking up the person_id.

Also, since the person_id lookup is pretty hairy (and includes ~20 lines
of comments to explain what it's doing!) refactor it out into a helper
method.

TESTED: Both SIP and PSTN calls; verified that contact name *and* photo
are displayed correctly in all cases.

Bug: 3121292
Change-Id: I2b0083cc5394c1a49bbdc9a4e5651854aedb82f7
2010-10-26 14:22:03 -07:00
Hung-ying Tyan
fbd21b5875 am d691b36c: am 6fe795ec: Do another contact lookup if the first one fails and...
Merge commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e'

* commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e':
  Do another contact lookup if the first one fails and...
2010-10-21 10:56:11 -07:00
Hung-ying Tyan
6fe795ecd3 Do another contact lookup if the first one fails and...
it's a SIP call and the peer's username is all numeric. The all-numeric username
could be a PSTN number.

Bug: 3105116 (case #2)

Change-Id: I1de9cfac3aab1c4c89935176264d07693adb5e7d
2010-10-21 02:54:57 +08:00
Wink Saville
1b422d8cd8 am 090ac9f7: am a3100314: Merge "Remove some PII." into gingerbread
Merge commit '090ac9f7dd883aa75c899745182471d409a2b762'

* commit '090ac9f7dd883aa75c899745182471d409a2b762':
  Remove some PII.
2010-10-13 19:40:16 -07:00
Wink Saville
a42880749b Remove some PII.
Change-Id: I4df27119b6bbd28bf950516fd6f44676a8e04f06
2010-10-12 12:36:38 -07:00
Wink Saville
3201b398d1 am 2e99245e: am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread
Merge commit '2e99245e0e0d64ba6ab9227154c7fad132559c01'

* commit '2e99245e0e0d64ba6ab9227154c7fad132559c01':
  Changed handling of onQueryCompelete to not use mimeType.
2010-10-10 09:08:55 -07:00
Wink Saville
2e27a0be78 Changed handling of onQueryCompelete to not use mimeType.
Using mimeType causes an IPC request to contacts which can
be slow. This can cause an ANR of the Phone app. This change
parses the URL and to decide which column to use for the person_id
and thus should not cause an ANR.

bug: 3060704
Change-Id: I750c72746c7269e162f0338c0a3e00230a600519
2010-10-07 08:28:34 -07:00
Bai Tao
6a3d188f18 Format the phone number with the number country's convention.
If the phone number doesn't have country code, the current country's convention will be used.

Change-Id: I3f6ea0104d1a67071bd3beadb667c7159e915eef
2010-09-20 18:18:41 +08:00
Nicolas Catania
c72509b4d8 Fix the CallerInfo lookup when a phone URL is used.
Typically the CallerInfo is looked up based on a phone number, in which case the '_id' column
contains the contact id.

However when the lookup is based on a phone row, the '_id' column is the row number we queried.
The contact id is stored somewhere else in a 'contact_id' column.

The current fix, checks the mime type of the contactRef URL to find out which column contains
the contact id.
I think the contact DB should be more consistent and always return the contact id AS contact_id even
in the phone number scenario.

Bug:2269240
2010-01-11 15:58:10 -08:00
Nicolas Catania
60d45f0f03 Added a field to track if the call is to a voicemail instance.
Refactored common code between CallerInfo and CallerInfoAsyncQuery that deal
with voicemail number comparison.

In CallerInfo.java added a new field mIsVoiceMail to indicate this is a
voicemail call.
Added a new method to convert the CallerInfo into a VM instance.
Added a new method to generate a debug string from an instance.

PhoneNumberUtils has a new method "isVoiceMailNumber" to check if a number
is a VM one. I left the method as hidden. Previously any security exception
failure was cached in a static variable. I removed that and
privilege the optmistic scenario. I am not sure if the security exception
is only for the 'regular' telephony layer and if it applies if a 3rd party
VM app is installed (e.g googlevoice), hence i removed the cashing to make
sure we can pick up new voicemail providers when installed/enabled/disabled.

Bug:2112640
2009-09-16 11:11:05 -07:00
Nicolas Catania
e22415817f New field in CallerInfo to cache if the call is an emergency one.
Fixed a bug in the sync call, the photo resource was not set to picture_emergency.

Added tests to check the correct emergency fields are set in the caller info instance.

Bug 2112640
2009-09-15 18:33:34 -07:00
Dmitri Plotnikov
84b4d37dd1 [Issue 2099206] Encoding phone number prior to sending it to the phone lookup filter
Change-Id: I80327febe7134ac1bdef958251943a9777879d53
2009-09-10 11:47:10 -07:00
Dmitri Plotnikov
3c513ed95c Converting CallerInfo to new Contacts API. 2009-08-19 16:31:01 -07:00
Wink Saville
2563a3ac05 Cleanup whitespace. 2009-06-09 10:30:03 -07:00
Wink Saville
dda5391d50 Motorola additions for CDMA support without CdmaSuppConnTracker
There are corresponding changes to hardware/ril and packages/apps/Phone
that are required to go with these changes.
2009-05-28 17:32:34 -07:00
The Android Open Source Project
105925376f auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:46 -07:00
The Android Open Source Project
9066cfe988 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce auto import from //depot/cupcake/@135843 2009-03-03 18:28:45 -08:00
The Android Open Source Project
f013e1afd1 Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
The Android Open Source Project
54b6cfa9a9 Initial Contribution 2008-10-21 07:00:00 -07:00