drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,088 Commits 1 Branch 0 Tags
Commit Graph

1098 Commits

Author SHA1 Message Date
Eric Laurent
977d362251 am ecae8a43: am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:17:07 -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
a35827a8e9 am 33051ad1: am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread 
Merge commit '33051ad1785a84ad5d814d6acf337b54d5fab36c'

* commit '33051ad1785a84ad5d814d6acf337b54d5fab36c':
  Fix connect duration for un-established SIP calls.
 2010-10-21 15:29:48 -07:00
Hung-ying Tyan
2cef210f53 am 940b4d1c: am 6037a056: Fix n-way conf call in SipPhone. 
Merge commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8'

* commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8':
  Fix n-way conf call in SipPhone.
 2010-10-21 13:43:43 -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
Jeff Hamilton
6967f09604 am e55806a5: am 23392a84: Fix the build. 
Merge commit 'e55806a55561c992086ddff717aca27206fa0c5d'

* commit 'e55806a55561c992086ddff717aca27206fa0c5d':
  Fix the build.
 2010-10-21 10:56:19 -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
821f087989 am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread 
Merge commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d'

* commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d':
  Silently reject a ringing call when another call is dialing/ringing.
 2010-10-21 10:56:02 -07:00
Hung-ying Tyan
164cd438fb am 51028569: am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread 
Merge commit '5102856947595cffc1cceb11b9e4c5baf70b2e82'

* commit '5102856947595cffc1cceb11b9e4c5baf70b2e82':
  Remove ringtone API from SipAudioCall.
 2010-10-21 10:55:33 -07:00
Hung-ying Tyan
4e00a8d582 am e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread 
Merge commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38'

* commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38':
  Return display name in SipConnection.getCnapName().
 2010-10-21 10:53:49 -07:00
Brad Fitzpatrick
385a753dea resolved conflicts for merge of 368fdba4 to master 
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
 2010-10-21 07:39:10 -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
97d88927f2 am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread 
Merge commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a'

* commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a':
  Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
 2010-10-15 13:40:16 -07: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
John Wang
b57832140e am 7a26ebdf: am 844a6b3c: Turn off additional debug. 
Merge commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef'

* commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef':
  Turn off additional debug.
 2010-10-13 19:14:56 -07: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
Hung-ying Tyan
99f92ac7a4 am f5b7c855: am f5201ab7: Keep original phone number in SipConnection. 
Merge commit 'f5b7c855fbb69e8614dab5ca15639228a2428784'

* commit 'f5b7c855fbb69e8614dab5ca15639228a2428784':
  Keep original phone number in SipConnection.
 2010-10-13 17:02:08 -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
Xia Wang
a5496cd28c resolved conflicts for merge of d4e3bf4d to master 
Change-Id: I41c0ae2b3f557f84b25c39e247894f66a4e7e702
 2010-10-12 11:05:54 -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
81bef57f6d am 5bf55c80: am 0e430ccc: Merge "Telephony: Fix radio state printing" 
Merge commit '5bf55c801dfd67e8cf98278f3590d352f9e6d64f'

* commit '5bf55c801dfd67e8cf98278f3590d352f9e6d64f':
  Telephony: Fix radio state printing
 2010-10-11 18:57:54 -07:00
David Brown
a23935ab33 am bd6d5098: am d07833f5: Don\'t manually create CallerInfo objects from SipPhone 
Merge commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3'

* commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3':
  Don't manually create CallerInfo objects from SipPhone
 2010-10-11 17:48:47 -07: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
John Wang
2b4b3bd4b4 am 5a41b3f8: am df512214: Merge "Fix startDtmf." into gingerbread 
Merge commit '5a41b3f8aa788f164af495bac6dc2666568f4cb6'

* commit '5a41b3f8aa788f164af495bac6dc2666568f4cb6':
  Fix startDtmf.
 2010-10-11 10:42:37 -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