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

932 Commits

Author SHA1 Message Date
John Wang
511f66d3b6 am afb777cb: am 0741a5ed: Merge "Add debug function." into gingerbread 
Merge commit 'afb777cbd459f45eb833e12fbab03aed93f90409'

* commit 'afb777cbd459f45eb833e12fbab03aed93f90409':
  Add debug function.
 2010-09-17 18:13:50 -07:00
John Wang
afb777cbd4 am 0741a5ed: Merge "Add debug function." into gingerbread 
Merge commit '0741a5ed38757ef2f6b52945ad494d965b3b83de' into gingerbread-plus-aosp

* commit '0741a5ed38757ef2f6b52945ad494d965b3b83de':
  Add debug function.
 2010-09-17 15:06:44 -07:00
John Wang
bd53554f8a Add debug function. 
Change-Id: If2381b04b08876f78ac93833f848f099de5c6104
 2010-09-17 13:53:45 -07:00
Hung-ying Tyan
0a56f342f9 am 960d409c: am 1d158357: SipPhone: do not append SIP domain to PSTN number 
Merge commit '960d409c79aad3a9f78d930cdebedcc0fb34c30e'

* commit '960d409c79aad3a9f78d930cdebedcc0fb34c30e':
  SipPhone: do not append SIP domain to PSTN number
 2010-09-17 02:06:19 -07:00
Hung-ying Tyan
960d409c79 am 1d158357: SipPhone: do not append SIP domain to PSTN number 
Merge commit '1d1583573d2099756bbbeef48d97c280edc393e0' into gingerbread-plus-aosp

* commit '1d1583573d2099756bbbeef48d97c280edc393e0':
  SipPhone: do not append SIP domain to PSTN number
 2010-09-17 02:03:39 -07:00
Hung-ying Tyan
6c62609e8f resolved conflicts for merge of 394d1e4b to master 
Change-Id: I2c3a0ff646e3024d422d809ce964bd188fc70bb7
 2010-09-17 16:56:05 +08:00
Hung-ying Tyan
394d1e4bed am afa583e6: SipAudioCall: expose startAudio() 
Merge commit 'afa583e6557557577188c3e40146ac8d6f2aa7c7' into gingerbread-plus-aosp

* commit 'afa583e6557557577188c3e40146ac8d6f2aa7c7':
  SipAudioCall: expose startAudio()
 2010-09-17 01:01:07 -07:00
Hung-ying Tyan
1d1583573d SipPhone: do not append SIP domain to PSTN number 
in the CallerInfo so that only PSTN number is shown in the call log.

http://b/issue?id=2982632

Change-Id: I414f01d16ce64ecb8da7c6943ea7f080bcfd2794
 2010-09-17 16:00:31 +08:00
Hung-ying Tyan
afa583e655 SipAudioCall: expose startAudio() 
so that apps can start audio when time is right.

Change-Id: I7ae96689d3a8006b34097533bc2434bc3814b82a
 2010-09-17 15:58:18 +08:00
Hung-ying Tyan
6308514cbf am 156edcc9: am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread 
Merge commit '156edcc9f64e010d6b6de97e9a77adfccee353eb'

* commit '156edcc9f64e010d6b6de97e9a77adfccee353eb':
  Add timer to SIP session creation process.
 2010-09-16 23:44:42 -07:00
Hung-ying Tyan
156edcc9f6 am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread 
Merge commit '9404e633a55cd325b57732cdd776053b3886b611' into gingerbread-plus-aosp

* commit '9404e633a55cd325b57732cdd776053b3886b611':
  Add timer to SIP session creation process.
 2010-09-16 23:40:28 -07:00
Hung-ying Tyan
9352cf1a4d Add timer to SIP session creation process. 
+ add timer parameter to ISipSession.make/changeCall(),
+ add timer paramter to SipAudioCall.make/answer/hold/continueCall()'s,
+ add timer parameter to SipManager.makeAudioCall(),
+ modify implementation in SipSessionGroup, SipAudioCallImpl accordingly,
+ make SipPhone to use it with 8-second timeout.

http://b/issue?id=2994748

Change-Id: I661a887e5810087ddc5e2318335e2fa427f80ec6
 2010-09-17 13:31:05 +08:00
Wink Saville
f61101f626 Add LinkCapabilities 
Change-Id: Ia1599ade936b79f12526252c0a2e6b453abb136e
 2010-09-16 21:26:59 -07:00
Chung-yih Wang
d6e15ab6aa am 170255b0: am d8f3d167: Add a new phone state ANSWERING. 
Merge commit '170255b0f0482baf843b881a02d9361adcc33742'

* commit '170255b0f0482baf843b881a02d9361adcc33742':
  Add a new phone state ANSWERING.
 2010-09-16 04:48:15 -07:00
Chung-yih Wang
170255b0f0 am d8f3d167: Add a new phone state ANSWERING. 
Merge commit 'd8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511' into gingerbread-plus-aosp

* commit 'd8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511':
  Add a new phone state ANSWERING.
 2010-09-16 04:45:44 -07:00
Chung-yih Wang
d8f3d16735 Add a new phone state ANSWERING. 
The state ANSWERING is set when we answer an incoming sip call, i.e.
sending a 'OK' response to the peer. The state will be set to ACTIVE
once the 'ACK' from peer is received.

Change-Id: I84ee3cc68222eb34e032896ce23f7431d4ad774a
 2010-09-16 19:09:16 +08:00
Hung-ying Tyan
03df1b5da6 am 1e563f91: am 968735e5: Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread 
Merge commit '1e563f91183d95f5ad2461b7bca864e8f223ef71'

* commit '1e563f91183d95f5ad2461b7bca864e8f223ef71':
  Fixing the NPE in SipPhone
 2010-09-15 17:54:01 -07:00
Hung-ying Tyan
3e5246b2eb am 8a33e964: am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread 
Merge commit '8a33e964c48d22469487c8ec1d951826b7e3e562'

* commit '8a33e964c48d22469487c8ec1d951826b7e3e562':
  SIP: add PEER_NOT_REACHABLE error feedback.
 2010-09-15 16:47:30 -07:00
Hung-ying Tyan
1e563f9118 am 968735e5: Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread 
Merge commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3' into gingerbread-plus-aosp

* commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3':
  Fixing the NPE in SipPhone
 2010-09-15 13:06:30 -07:00
John Wang
91382a6f88 am 8028bd5b: am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread 
Merge commit '8028bd5b696fd94d33c905c4279d6505e985d70b'

* commit '8028bd5b696fd94d33c905c4279d6505e985d70b':
  Complete event registration in CallManager.
 2010-09-15 12:33:19 -07:00
jsh
19c5df7452 am b30f2188: am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread 
Merge commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94'

* commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94':
  Unhide GsmCellLocation.getPsc().
 2010-09-15 12:19:05 -07:00
Hung-ying Tyan
8a33e964c4 am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread 
Merge commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482' into gingerbread-plus-aosp

* commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482':
  SIP: add PEER_NOT_REACHABLE error feedback.
 2010-09-15 07:42:48 -07:00
John Wang
c711149195 am e92fdd26: am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread 
Merge commit 'e92fdd261eed516a8821675ceca971d1c90d772b'

* commit 'e92fdd261eed516a8821675ceca971d1c90d772b':
  Return immutable copies of private callList.
 2010-09-15 07:09:00 -07:00
Hung-ying Tyan
b1c4a01985 am ae83faa3: am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError() 
Merge commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5'

* commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5':
  SipAudioCall: use SipErrorCode instead of string in onError()
 2010-09-15 07:08:04 -07:00
Hung-ying Tyan
074663c762 am ca83c25d: am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread 
Merge commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a'

* commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a':
  SipService: deliver connectivity change to all sessions.
 2010-09-15 07:07:19 -07:00
Chung-yih Wang
94e498332a Fixing the NPE in SipPhone 
bug id: http://b/2987816

Change-Id: Iee252eee0a5243b70ff0b6f287279f92235b5b2d
 2010-09-15 19:39:01 +08:00
Hung-ying Tyan
5306e0a85d Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread 2010-09-14 23:10:03 -07:00
Hung-ying Tyan
ae076d3981 SIP: add PEER_NOT_REACHABLE error feedback. 
http://b/issue?id=3002033

Change-Id: Ib64b08919d214acbab89945ac19dc113a68e62ad
 2010-09-15 11:30:45 +08:00
John Wang
8028bd5b69 am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread 
Merge commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5' into gingerbread-plus-aosp

* commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5':
  Complete event registration in CallManager.
 2010-09-14 16:28:10 -07:00
John Wang
59f9bae81d Complete event registration in CallManager. 
1. Originally CallManager registers for all phone events provided by registerFor interface,

which will cause error msg such as "registerForXXX() in PhoneBase should not be called, CDMAPhone inactive."

for CDMA only events. Register for those events only if phone is CDMA phone.

2. Add registerForPostDialCharacter().

Note, we can't use notifyRegistrants() in handler since we need send

the character that is being processed in msg.arg1.

Change-Id: I48037c8a8e225bb82e203836a041f81f2445f4d8
 2010-09-14 16:01:50 -07:00
jsh
b30f218820 am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread 
Merge commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4' into gingerbread-plus-aosp

* commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4':
  Unhide GsmCellLocation.getPsc().
 2010-09-14 15:05:53 -07:00
jsh
2ec0e6fe1e Unhide GsmCellLocation.getPsc(). 
bug: 2465036
Change-Id: If071c4e0f1f3484c010ec908b02800361cbf8a86
 2010-09-14 11:13:27 -07:00
John Wang
e92fdd261e am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread 
Merge commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6' into gingerbread-plus-aosp

* commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6':
  Return immutable copies of private callList.
 2010-09-14 10:31:45 -07:00
John Wang
e7b92d7b53 Merge "Return immutable copies of private callList." into gingerbread 2010-09-14 10:28:33 -07:00
Hung-ying Tyan
ae83faa3ee am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError() 
Merge commit '13f6270eb14b409709c936b828e2a2fd40e427c4' into gingerbread-plus-aosp

* commit '13f6270eb14b409709c936b828e2a2fd40e427c4':
  SipAudioCall: use SipErrorCode instead of string in onError()
 2010-09-14 09:44:03 -07:00
Hung-ying Tyan
ca83c25dec am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread 
Merge commit '4565933f03a99750a333e97e95408c404984510f' into gingerbread-plus-aosp

* commit '4565933f03a99750a333e97e95408c404984510f':
  SipService: deliver connectivity change to all sessions.
 2010-09-14 09:43:17 -07:00
Hung-ying Tyan
13f6270eb1 SipAudioCall: use SipErrorCode instead of string in onError() 
and fix callback in setListener().

Change-Id: Ic2622df992a2ad45cb1e3f71736f320897ae8fb3
 2010-09-14 21:36:10 +08:00
John Wang
bc0e400d78 Return immutable copies of private callList. 
Change-Id: I3da97acf89e044515e98fa04233dd378c32c250d
 2010-09-13 19:10:21 -07:00
Hung-ying Tyan
d231aa880a SipService: deliver connectivity change to all sessions. 
+ add DATA_CONNECTION_LOST to SipErrorCode
+ convert it to Connection.DisconnectCause.LOST_SIGNAL in SipPhone

http://b/issue?id=2992548

Change-Id: Ie8983c1b81077b21f46304cf60b8e61df1ffd241
 2010-09-14 08:00:09 +08:00
Hung-ying Tyan
0b5a8bd579 am a5dce0c1: am 3d7606aa: SIP: enhance timeout and registration status feedback. 
Merge commit 'a5dce0c15ac05724b4595d62d521a481c7e1f86a'

* commit 'a5dce0c15ac05724b4595d62d521a481c7e1f86a':
  SIP: enhance timeout and registration status feedback.
 2010-09-13 02:50:26 -07:00
Hung-ying Tyan
a5dce0c15a am 3d7606aa: SIP: enhance timeout and registration status feedback. 
Merge commit '3d7606aa607b24817e37c264f2141ed7b2d50be0' into gingerbread-plus-aosp

* commit '3d7606aa607b24817e37c264f2141ed7b2d50be0':
  SIP: enhance timeout and registration status feedback.
 2010-09-13 02:48:22 -07:00
Hung-ying Tyan
3d7606aa60 SIP: enhance timeout and registration status feedback. 
http://b/issue?id=2984419
http://b/issue?id=2991065

Change-Id: I2d3b1dd3a70079ff347f7256f4684aea07847f4e
 2010-09-13 17:45:39 +08:00
Hung-ying Tyan
e765994831 am 38dc67f4: am 25b52a2f: SIP: remove dependency on javax.sip.SipException. 
Merge commit '38dc67f49ec77d34c858777144323960c37d045e'

* commit '38dc67f49ec77d34c858777144323960c37d045e':
  SIP: remove dependency on javax.sip.SipException.
 2010-09-13 02:21:09 -07:00
Hung-ying Tyan
38dc67f49e am 25b52a2f: SIP: remove dependency on javax.sip.SipException. 
Merge commit '25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e' into gingerbread-plus-aosp

* commit '25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e':
  SIP: remove dependency on javax.sip.SipException.
 2010-09-13 02:16:52 -07:00
Hung-ying Tyan
25b52a2f97 SIP: remove dependency on javax.sip.SipException. 
Change-Id: I77d289bef1b5e7f1ec0c0408d0bbf96c21085cd7
 2010-09-13 16:50:12 +08:00
Jaikumar Ganesh
547705d3ef am b9871461: am e442fb6c: Merge "Register ServiceStateChanged to CallManager." into gingerbread 
Merge commit 'b987146123879217a6cdcdfeffdddd917edb22cc'

* commit 'b987146123879217a6cdcdfeffdddd917edb22cc':
  Register ServiceStateChanged to CallManager.
 2010-09-10 16:23:24 -07:00
Jaikumar Ganesh
b987146123 am e442fb6c: Merge "Register ServiceStateChanged to CallManager." into gingerbread 
Merge commit 'e442fb6c9215fc6329522915805a9582ec2c3323' into gingerbread-plus-aosp

* commit 'e442fb6c9215fc6329522915805a9582ec2c3323':
  Register ServiceStateChanged to CallManager.
 2010-09-10 16:01:19 -07:00
Jaikumar Ganesh
e442fb6c92 Merge "Register ServiceStateChanged to CallManager." into gingerbread 2010-09-10 15:54:19 -07:00
John Wang
d028bd0a5f Register ServiceStateChanged to CallManager. 
Change-Id: I216bac222e1bfd93ad36c0aeafa85c232dd60abe
 2010-09-10 15:23:21 -07:00
Wink Saville
8d8fce8821 am 9a3ce10c: Merge "Fix bug 2972138 Lost cell data connection and didn\'t get it back, DO NOT MERGE." into gingerbread 
Merge commit '9a3ce10c6cafa4a2528ce9f3fdb6163acf5eb7b2' into gingerbread-plus-aosp

* commit '9a3ce10c6cafa4a2528ce9f3fdb6163acf5eb7b2':
  Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE.
 2010-09-10 11:32:36 -07:00