1015 Commits

Author SHA1 Message Date
Rekha Kumar
ee7d1973ff Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
Add parser to parse 3GPP2 format sms stored in CSIM/RUIM card

Change-Id: I4720ba7602fcc1b078de0d5fea34247541242c1c
2010-11-02 13:14:38 -07:00
Johannes Carlsson
3ffccab786 Release reference when putting RILRequest back into the pool.
In order to reduce object creation the RILRequest objects are
stored in an array when it is unused (max 4). This avoids GC
of the object. The object in turn has references to other
objects which sometimes hold large memory chunks. This fix
releases these references since they are not used anyway.

This will make it possible to GC the Message (mResult) which
in some cases holds references to a Bitmap which sometimes
leads to OutOfMemoryException. The reference is cleared
anyway in RILRequest.obtain(...)

Change-Id: I3b895bc39b5e2f3ab7cc8297c3583ea78e0ebc77
2010-10-27 08:28:14 +02: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
Eric Laurent
ecae8a43b7 am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:14:48 -07:00
Eric Laurent
164a8f86c7 Partial fix for issue 3124895.
When a SIP call is put on hold and no other call is active, the audio mode should not be
switched to incall.

Change-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af
2010-10-25 19:45:39 -07:00
John Huang
33051ad178 am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread
Merge commit '7dc08fb070ff7455e794fc81645ccb4349cd152f' into gingerbread-plus-aosp

* commit '7dc08fb070ff7455e794fc81645ccb4349cd152f':
  Fix connect duration for un-established SIP calls.
2010-10-21 11:46:55 -07:00
Hung-ying Tyan
5d9e3bbb9d Fix connect duration for un-established SIP calls.
Bug: 3118364
Change-Id: I931b675de04a3aac70b45d6bae27ab42a84f2d1e
2010-10-21 15:54:46 +08:00
Hung-ying Tyan
940b4d1c45 am 6037a056: Fix n-way conf call in SipPhone.
Merge commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7' into gingerbread-plus-aosp

* commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7':
  Fix n-way conf call in SipPhone.
2010-10-20 14:03:43 -07:00
Jeff Hamilton
e55806a555 am 23392a84: Fix the build.
Merge commit '23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp

* commit '23392a84bcb961d3fd50142ec40ce6ac6db89018':
  Fix the build.
2010-10-20 13:57:26 -07:00
Hung-ying Tyan
d691b36cde am 6fe795ec: Do another contact lookup if the first one fails and...
Merge commit '6fe795ecd35c4d49822d349424fc71b660577dfc' into gingerbread-plus-aosp

* commit '6fe795ecd35c4d49822d349424fc71b660577dfc':
  Do another contact lookup if the first one fails and...
2010-10-20 13:57:20 -07:00
Hung-ying Tyan
fd0ba81c02 am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Merge commit 'baced375ba5f374445c44a2115700d69693794a0' into gingerbread-plus-aosp

* commit 'baced375ba5f374445c44a2115700d69693794a0':
  Silently reject a ringing call when another call is dialing/ringing.
2010-10-20 13:56:59 -07:00
Hung-ying Tyan
5102856947 am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread
Merge commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184' into gingerbread-plus-aosp

* commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184':
  Remove ringtone API from SipAudioCall.
2010-10-20 13:54:25 -07:00
Hung-ying Tyan
6037a056ea Fix n-way conf call in SipPhone.
+ Avoid concurrent modification when forming >3-way conf call.
+ Revise SipConnection.separate() to put the newly separated call to foreground.

Bug: 3114987

Change-Id: If6204e7e3cc05f4a516c33657a368b53a0ad014d
2010-10-21 03:59:04 +08:00
Jeff Hamilton
23392a84bc Fix the build.
Change-Id: Id5bfa0f91e6ec687201a320a1eb4d8a46050875e
2010-10-20 14:20:29 -05: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
Hung-ying Tyan
88e3f0ad28 Silently reject a ringing call when another call is dialing/ringing.
http://b/issue?id=3109483
http://b/issue?id=3103072

Change-Id: I34f13225319c7f2a41e1ea9e25811866432ab809
2010-10-21 02:38:04 +08:00
Hung-ying Tyan
9b449e5606 Remove ringtone API from SipAudioCall.
(watch out auto-merge conflict for SipAudioCall).

Bug: 3113033, related CL: https://android-git/g/#change,75185

Change-Id: Ib48d3b990e229e0b341e47e10e76934e1a50d10f
2010-10-20 22:51:22 +08:00
Hung-ying Tyan
e894ff7a76 am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread
Merge commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp

* commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd':
  Return display name in SipConnection.getCnapName().
2010-10-19 23:03:25 -07:00
Hung-ying Tyan
b595e094e3 Merge "Return display name in SipConnection.getCnapName()." into gingerbread 2010-10-19 23:00:16 -07:00
Hung-ying Tyan
538e58fc75 Return display name in SipConnection.getCnapName().
Bug: 3105116 (case #1)

Change-Id: Iedf3c8de07213c786cffb861bd52c3b4a768a86c
2010-10-20 11:21:55 +08:00
Joe Onorato
368fdba47a am bdf1706a: Merge "Reduce logging." into gingerbread
Merge commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp

* commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306':
  Reduce logging.
2010-10-19 12:29:43 -07:00
Joe Onorato
431bb22695 Reduce logging.
Remember, the system and main logs are
    - Shared resources
    - Primarily for recording problems
    - To be used only for large grained events during normal operation

Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
2010-10-19 15:08:05 -04:00
David Brown
e3c50a5470 am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread
Merge commit 'cebe5b2e01f8ebbf9089aebc386caecea232df76' into gingerbread-plus-aosp

* commit 'cebe5b2e01f8ebbf9089aebc386caecea232df76':
  Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
2010-10-13 17:50:43 -07:00
David Brown
d34d30ac2e Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
Bug: 3095005

Change-Id: Ide96756282d17252fac16a27cc184ea314a8b31a
2010-10-13 17:02:33 -07:00
Wink Saville
090ac9f7dd am a3100314: Merge "Remove some PII." into gingerbread
Merge commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6' into gingerbread-plus-aosp

* commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6':
  Remove some PII.
2010-10-12 14:21:10 -07:00
Wink Saville
a42880749b Remove some PII.
Change-Id: I4df27119b6bbd28bf950516fd6f44676a8e04f06
2010-10-12 12:36:38 -07:00
John Wang
7a26ebdf0d am 844a6b3c: Turn off additional debug.
Merge commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e' into gingerbread-plus-aosp

* commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e':
  Turn off additional debug.
2010-10-12 11:55:31 -07:00
John Wang
844a6b3cca Turn off additional debug.
Bug:3038245
Change-Id: If3c894511b4bbfd0d3e95b51aeca299edbbcf55d
2010-10-12 11:32:24 -07:00
Hung-ying Tyan
f5b7c855fb am f5201ab7: Keep original phone number in SipConnection.
Merge commit 'f5201ab71ff4d104265ab126e86afc6b81da8011' into gingerbread-plus-aosp

* commit 'f5201ab71ff4d104265ab126e86afc6b81da8011':
  Keep original phone number in SipConnection.
2010-10-11 20:55:56 -07:00
Hung-ying Tyan
f5201ab71f Keep original phone number in SipConnection.
In case it's a PSTN number carried by an Internet call, the phone app can still
get the original phone number from Connection.getAddress() instead of getting a
SIP URI.

http://b/issue?id=3085996

Change-Id: Ie6c66100a4b5b2ce3f73baa1b446761cd51d7727
2010-10-12 11:34:01 +08:00
Jean-Baptiste Queru
cf88cf878b am 15f7ff3c: Merge "Fix compile errors in telephony tests"
Merge commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f' into gingerbread-plus-aosp

* commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f':
  Fix compile errors in telephony tests
2010-10-11 15:32:12 -07:00
Jean-Baptiste Queru
15f7ff3c5a Merge "Fix compile errors in telephony tests" 2010-10-11 15:11:59 -07:00
Xia Wang
d4e3bf4d03 am c8511af0: Merge "Add mock ril control commands and tests" into gingerbread
Merge commit 'c8511af04a442551a204b1f47fabb317bcf54be0' into gingerbread-plus-aosp

* commit 'c8511af04a442551a204b1f47fabb317bcf54be0':
  Add mock ril control commands and tests
2010-10-11 10:32:04 -07:00
Xia Wang
c8511af04a Merge "Add mock ril control commands and tests" into gingerbread 2010-10-11 10:28:20 -07:00
Jean-Baptiste Queru
5bf55c801d am 0e430ccc: Merge "Telephony: Fix radio state printing"
Merge commit '0e430ccc2c8a4bb9d96002676d7742652bd28477' into gingerbread-plus-aosp

* commit '0e430ccc2c8a4bb9d96002676d7742652bd28477':
  Telephony: Fix radio state printing
2010-10-10 18:37:41 -07:00
Jean-Baptiste Queru
0e430ccc2c Merge "Telephony: Fix radio state printing" 2010-10-10 18:32:39 -07:00
Jean-Baptiste Queru
334a4d84df Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone" 2010-10-10 18:15:17 -07:00
David Brown
bd6d5098a7 am d07833f5: Don\'t manually create CallerInfo objects from SipPhone
Merge commit 'd07833f54b6e8e361b666ae16efa15fdf60159de' into gingerbread-plus-aosp

* commit 'd07833f54b6e8e361b666ae16efa15fdf60159de':
  Don't manually create CallerInfo objects from SipPhone
2010-10-10 16:44:01 -07:00
David Brown
d07833f54b Don't manually create CallerInfo objects from SipPhone
Currently the SipPhone class manually creates a CallerInfo object, and
populates it with very basic info from the SIP address, when making an
outgoing call.

But this is no longer needed, now that we do caller-id lookup properly for
SIP addresses (based on real data from the contacts database -- see
bug 3004127 and change https://android-git.corp.google.com/g/70555).
And in fact the presence of this initial CallerInfo object actually
*disabled* contacts lookup for outgoing calls (bug 3072731).

This change removes all that CallerInfo-related stuff from SipPhone.

(Thus SipPhone is now consistent with the other phone objects, like
GSMPhone and CDMAPhone, in that it doesn't muck with CallerInfo data at
all, but instead lets the phone app do it.)

Also, update isUriNumber() to handle "%40" in case the passed-in string is
URI-escaped.  (Nobody depends on that now, but it may be needed in the
future, and it's certainly safe to say that "%40" will never be found in a
legal PSTN number.)

TESTED:
  - Outgoing SIP call:
    - In-call UI shows correct contact info
    - After the call, Call Log shows correct contact info

  - Incoming SIP call:
    - In-call UI shows correct contact info
    - After the call, Call Log shows correct contact info

  - PSTN calls:
    - correct contact info everywhere

Bug: 3072731

Change-Id: I51434e4e5ad66d2e8ff51fc220001fb74485f0f5
2010-10-10 16:40:21 -07:00
Xia Wang
ffcb68719b Add mock ril control commands and tests
Add mock ril controller commands and test cases:
 - testStartIncomingCallAndHangup: test start incoming cal and hangup remote
 - testSetCallTransitionFlag: test call transition flag and call state transition

Change-Id: I25ff8ef7931159ef7101b5e8638b9b7438db4f66
2010-10-10 15:01:31 -07:00
John Wang
5a41b3f8aa am df512214: Merge "Fix startDtmf." into gingerbread
Merge commit 'df5122147c6e1c988c6a8504e71501cbbece5298' into gingerbread-plus-aosp

* commit 'df5122147c6e1c988c6a8504e71501cbbece5298':
  Fix startDtmf.
2010-10-10 11:42:10 -07:00
John Wang
864032f951 Fix startDtmf.
Call correct startDtmf() function.

Bug: 3033030

Change-Id: Ia90311ac5d2e4b070a28533c865c81dc90326557
2010-10-10 11:36:05 -07:00
Jean-Baptiste Queru
965d533733 am 38f53488: Merge "NullPointerException at handleMessage(GSMPhone.java)"
Merge commit '38f534882eb9214b4c1a8035990157f941762f85' into gingerbread-plus-aosp

* commit '38f534882eb9214b4c1a8035990157f941762f85':
  NullPointerException at handleMessage(GSMPhone.java)
2010-10-08 13:32:30 -07:00
Babis Triantafyllou
aeab76c5be NullPointerException at handleMessage(GSMPhone.java)
NullPointerException at
com.android.internal.telephony.gsm.GSMPhone.handleMessage(GSMPhone.java)
Failing to retrieved the IMSI number from SIM card could lead to
an exception. A null pointer check will prevent this.

Change-Id: I26760543484504c8d35215bfb1e8f1ae664aeade
2010-10-08 16:02:11 +02:00
Xia Wang
d185494da6 am e1c8e388: Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbread
Merge commit 'e1c8e38834dffbeaeacbbe0490a5eae45b54db8b' into gingerbread-plus-aosp

* commit 'e1c8e38834dffbeaeacbbe0490a5eae45b54db8b':
  Port mock ril controller and tests to GB. DO NOT MERGE
2010-10-07 15:47:27 -07:00
Xia Wang
e1c8e38834 Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbread 2010-10-07 14:04:12 -07:00
John Wang
5df4b5a78b am 08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread
Merge commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp

* commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630':
  Add flag to skip restoring network seletion.
2010-10-07 14:00:53 -07:00
Xia Wang
afeeaf351a Port mock ril controller and tests to GB. DO NOT MERGE
Change-Id: Ie58236ecb8648d026356610f429054cb46b8640b
2010-10-07 11:34:46 -07:00
John Wang
35c4c211e0 Add flag to skip restoring network seletion.
For bug 3045366.

Change-Id: I7ad9ff89b0a77df473b638ad917b363c42de5405
2010-10-07 09:44:19 -07:00
Wink Saville
2e99245e0e am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread
Merge commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc' into gingerbread-plus-aosp

* commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc':
  Changed handling of onQueryCompelete to not use mimeType.
2010-10-07 09:16:54 -07:00