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

198 Commits

Author SHA1 Message Date
Hung-ying Tyan
51d2adab83 am 1f34ffd7: am 5cab38ba: Merge "SIP: minor fixes." into gingerbread 
Merge commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99'

* commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99':
  SIP: minor fixes.
 2010-10-03 22:49:09 -07:00
Hung-ying Tyan
9ea96c6cad SIP: minor fixes. 
+ Log error instead of crashing app process in SipManager's ListenerRelay.
+ Terminate dialog and transaction in SipSessionGroup.reset().
+ Remove redundant reset() in SipSessionGroup.

Change-Id: Ifbf29d2c9607ffe1a1a50b0c131ee3a4e81a0d0e
 2010-10-04 08:07:42 +08:00
Chia-chi Yeh
82fb4ef335 am c38e6ae4: am 274e3b5d: Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread 
Merge commit 'c38e6ae40096ec60bc42de663f39dc061b9c90f4'

* commit 'c38e6ae40096ec60bc42de663f39dc061b9c90f4':
  RTP: Start AudioRecord before AudioTrack to avoid being disabled.
 2010-09-30 19:47:49 -07:00
Hung-ying Tyan
1041bb7eec am 9af6b536: am 063d02bb: Merge "SipService: turn off verbose logging" into gingerbread 
Merge commit '9af6b53676061db6fc9c18300dc7d8258f7306ab'

* commit '9af6b53676061db6fc9c18300dc7d8258f7306ab':
  SipService: turn off verbose logging
 2010-09-30 19:46:40 -07:00
Chia-chi Yeh
274e3b5d75 Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread 2010-09-30 17:41:09 -07:00
Hung-ying Tyan
063d02bb03 Merge "SipService: turn off verbose logging" into gingerbread 2010-09-30 17:20:25 -07:00
Chia-chi Yeh
67ecb5b90c RTP: Start AudioRecord before AudioTrack to avoid being disabled. 
Change-Id: I96be89fda41d77e2cf5bfc1c2f14e2b109001b57
 2010-10-01 08:20:09 +08:00
Hung-ying Tyan
b031957d52 SipService: turn off verbose logging 
Change-Id: I264662ba17d215d532f58b6ee793e569fe67c334
 2010-10-01 07:09:30 +08:00
Chia-chi Yeh
2e88d0c4bc am 2b133fc0: am 21ae1ad6: RTP: Minor fixes with polishing. 
Merge commit '2b133fc07533a853f7de23da4f60a766f4233bed'

* commit '2b133fc07533a853f7de23da4f60a766f4233bed':
  RTP: Minor fixes with polishing.
 2010-09-30 13:36:50 -07:00
Hung-ying Tyan
e0ed9dbcb8 am c79e74ec: am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbread 
Merge commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3'

* commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3':
  Add uri field to SipManager.ListenerRelay
 2010-09-30 13:36:37 -07:00
Chia-chi Yeh
bf45f19435 am f6381ec1: am dfd1484e: Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread 
Merge commit 'f6381ec1da1166e3350d897faae654afb2c21a5a'

* commit 'f6381ec1da1166e3350d897faae654afb2c21a5a':
  RTP: Adjust the jitter buffer to 512ms.
 2010-09-30 13:36:31 -07:00
Hung-ying Tyan
f3da1ea405 am 34552149: am 6a53489a: SipService: add UID check. 
Merge commit '34552149e4b997d4ed3383fc153faff2bb189066'

* commit '34552149e4b997d4ed3383fc153faff2bb189066':
  SipService: add UID check.
 2010-09-30 13:36:16 -07:00
Chia-chi Yeh
a77c9541d0 am cbee6229: am 0a537b78: Merge "RTP: Enable AMR codec." into gingerbread 
Merge commit 'cbee622954de5e9e0c07557f8ec9aaa741110043'

* commit 'cbee622954de5e9e0c07557f8ec9aaa741110043':
  RTP: Enable AMR codec.
 2010-09-30 12:02:10 -07:00
Hung-ying Tyan
d161479237 am 947d2abd: am 2365b78e: Merge "SIP: misc fixes." into gingerbread 
Merge commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71'

* commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71':
  SIP: misc fixes.
 2010-09-30 12:02:03 -07:00
Chia-chi Yeh
5a7c6d298e am 1c2eab2d: am 955ab37c: Merge "RTP: Enable GSM-EFR codec." into gingerbread 
Merge commit '1c2eab2d86faa9c647a9893f761a50cfa28d9d57'

* commit '1c2eab2d86faa9c647a9893f761a50cfa28d9d57':
  RTP: Enable GSM-EFR codec.
 2010-09-30 10:59:48 -07:00
Chia-chi Yeh
21ae1ad6a6 RTP: Minor fixes with polishing. 
Change-Id: I50641373989e512fb489b5017edbcfd7848fe8b9
 2010-09-30 16:07:44 +08:00
Hung-ying Tyan
d29e075418 Merge "Add uri field to SipManager.ListenerRelay" into gingerbread 2010-09-30 00:05:58 -07:00
Hung-ying Tyan
9e1d308e99 Add uri field to SipManager.ListenerRelay 
in case mSession is not available.

Change-Id: Ifee2c129e48aa1177f648f176413ab6aa5606770
 2010-09-30 15:00:34 +08:00
Chia-chi Yeh
dfd1484e3b Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread 2010-09-29 23:24:32 -07:00
Chia-chi Yeh
3520bd4313 RTP: Adjust the jitter buffer to 512ms. 
Change-Id: Ia91c1aa1a03b65dbd329ea98383f370844e2b0c0
 2010-09-30 13:51:26 +08:00
Chia-chi Yeh
8ff0722453 am 1254b9c5: am cd386649: Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread 
Merge commit '1254b9c534c5f027f8928fbb3e743e57d55bd13d'

* commit '1254b9c534c5f027f8928fbb3e743e57d55bd13d':
  RTP: Revise the workaround of private addresses and fix bugs.
 2010-09-29 22:13:44 -07:00
Hung-ying Tyan
6a53489ae5 SipService: add UID check. 
Only allow creator or radio user to access profiles.

Change-Id: I548938f117926bcc878419142d1b5d818a4e70df
 2010-09-30 12:40:11 +08:00
Chia-chi Yeh
0a537b78d3 Merge "RTP: Enable AMR codec." into gingerbread 2010-09-29 18:32:24 -07:00
Hung-ying Tyan
2365b78e64 Merge "SIP: misc fixes." into gingerbread 2010-09-29 18:12:12 -07:00
Chia-chi Yeh
f88fc1fa90 RTP: Enable AMR codec. 
Change-Id: I49e6bdc1b67306b44173f2f346f8372a50264870
 2010-09-30 08:55:12 +08:00
Hung-ying Tyan
fb3a98b1d8 SIP: misc fixes. 
+ Fix keepalive timer event leak due to the race between stopping timer and
  the async'ed timeout handler
+ SipSessionImpl: set state before handling an event to ensure we get correct
  state when some error occurs during handling the event.
+ Fix potential NPE in SipManager.ListenerRelay.getUri().

Change-Id: I021ee34f83059fd4fbb64b30bea427a5462aa51b
 2010-09-30 08:10:17 +08:00
Chia-chi Yeh
f4ae94229d RTP: Enable GSM-EFR codec. 
Change-Id: I9d84009e4557a0a82c1f9d7d543922741be97c77
 2010-09-30 03:07:57 +08:00
Chia-chi Yeh
fe5298992a RTP: Revise the workaround of private addresses and fix bugs. 
Change-Id: Ie654b569f47049aa452eca8d3e6d4a98ac18469c
 2010-09-30 02:43:48 +08:00
Chia-chi Yeh
dcf2be6cf6 am ebfe5632: am e006e4d2: Merge changes Iae1913fb,I38dbefef into gingerbread 
Merge commit 'ebfe5632db275a89b49ab828064ba90db59702cf'

* commit 'ebfe5632db275a89b49ab828064ba90db59702cf':
  RTP: Enable GSM codec.
  RTP: Refactor out G711 codecs into another file.
 2010-09-28 19:47:07 -07:00
Chia-chi Yeh
e006e4d2c9 Merge changes Iae1913fb,I38dbefef into gingerbread 
* changes:
  RTP: Enable GSM codec.
  RTP: Refactor out G711 codecs into another file.
 2010-09-28 19:40:59 -07:00
Chia-chi Yeh
a6f950c968 RTP: Enable GSM codec. 
Change-Id: Iae1913fb0643f1c66b5d16f24d51924d363e5ef5
 2010-09-29 10:36:52 +08:00
Chia-chi Yeh
9783052ec1 am df31e03c: am 320cdcb1: Merge "RTP: Delay the initialization of AudioTrack and AudioRecord." into gingerbread 
Merge commit 'df31e03c47cd4caf45d8a58cf1fe5893da48ec6c'

* commit 'df31e03c47cd4caf45d8a58cf1fe5893da48ec6c':
  RTP: Delay the initialization of AudioTrack and AudioRecord.
 2010-09-28 17:38:09 -07:00
Hung-ying Tyan
0b3968ae53 am 0d447760: am 6d028dd2: Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread 
Merge commit '0d44776016cecf1c7c826c4784f8f867a56235f0'

* commit '0d44776016cecf1c7c826c4784f8f867a56235f0':
  SIP: Feedback any provisional responses in addition to RING
 2010-09-28 17:37:04 -07:00
Chia-chi Yeh
78c11b3cf1 RTP: Refactor out G711 codecs into another file. 
Change-Id: I38dbefef2315a28d44683e86a51e69f38e3f20ec
 2010-09-29 05:46:19 +08:00
Chia-chi Yeh
320cdcb122 Merge "RTP: Delay the initialization of AudioTrack and AudioRecord." into gingerbread 2010-09-28 14:41:18 -07:00
Chia-chi Yeh
9083c84af1 RTP: Delay the initialization of AudioTrack and AudioRecord. 
Related to http://b/3043844.

Change-Id: I2c4fd9f64e6eba597d68b2ea1ceeff83103697db
 2010-09-29 05:24:34 +08:00
Hung-ying Tyan
6c6eacda80 am f7e13400: am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR 
Merge commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236'

* commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236':
  SIP: add DisconnectCause.SERVER_ERROR
 2010-09-28 12:47:49 -07:00
Hung-ying Tyan
6057cd00d9 SIP: Feedback any provisional responses in addition to RING 
The only exception is TRYING.
Also remove an unused import in SipSessionGroup.

http://b/issue?id=3021865

Change-Id: I160982b0c4b417362f1fb961217db90c3a585ce5
 2010-09-29 02:26:47 +08:00
Hung-ying Tyan
624d5b4e8c SIP: add DisconnectCause.SERVER_ERROR 
and fix how SipErrorCode.SERVER_ERROR is determinted from server response, not
from local exceptions.

http://b/issue?id=3041332

Change-Id: Idce67e29858d5c7573b98b7fa1fac074913d71d6
 2010-09-28 14:54:13 +08:00
Hung-ying Tyan
a57afb6a6c resolved conflicts for merge of 2a36a778 to master 
Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3
 2010-09-28 12:17:44 +08:00
Hung-ying Tyan
7e54ef71db Move SipService out of SystemServer to phone process. 
Companion CL: https://android-git/g/#change,70187
http://b/issue?id=2998069

Change-Id: I90923ac522ef363a4e04292f652d413c5a1526ad
 2010-09-28 05:19:35 +08:00
Hung-ying Tyan
5a474a2bb8 am 44669d31: am fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread 
Merge commit '44669d31d1d5b094d7b7d3e393281440ea0c9536'

* commit '44669d31d1d5b094d7b7d3e393281440ea0c9536':
  SipAudioCall: remove SipManager dependency.
 2010-09-27 11:47:42 -07:00
Hung-ying Tyan
031d878682 am fe2d279c: am 00a22064: SipService: handle cross-domain authentication error 
Merge commit 'fe2d279c5ef571340f20d433badd9f68072299af'

* commit 'fe2d279c5ef571340f20d433badd9f68072299af':
  SipService: handle cross-domain authentication error
 2010-09-27 11:47:32 -07:00
Hung-ying Tyan
fd144d7667 Merge "SipAudioCall: remove SipManager dependency." into gingerbread 2010-09-27 10:54:27 -07:00
Hung-ying Tyan
00a22064ef SipService: handle cross-domain authentication error 
and add new CROSS_DOMAIN_AUTHENTICATION error code and OUT_OF_NETWORK
DisconnectCause.

http://b/issue?id=3020185

Change-Id: Icc0a341599d5a72b7cb2d43675fbddc516544978
 2010-09-27 10:45:24 -07:00
Chung-yih Wang
5e18ad0c53 am 4a04a312: am bd229420: Fix the unhold issue especially if one is behind NAT. 
Merge commit '4a04a3129bd30a996dd302b982aeca8f228f57e8'

* commit '4a04a3129bd30a996dd302b982aeca8f228f57e8':
  Fix the unhold issue especially if one is behind NAT.
 2010-09-27 09:07:43 -07:00
Chung-yih Wang
bd2294204e Fix the unhold issue especially if one is behind NAT. 
+call startAudio() when call is established.

Change-Id: Ib6a1e34017fb83007ce275da1991058e8b803833
 2010-09-27 23:53:39 +08:00
Hung-ying Tyan
3a4197e642 SipAudioCall: remove SipManager dependency. 
Change-Id: I2dc8bf427e52f64529ee0e0261362b975a8917c6
 2010-09-24 23:27:40 +08:00
Hung-ying Tyan
a97c5f7779 Merge "fix build" 2010-09-23 23:24:35 -07:00
Hung-ying Tyan
fb0264096e fix build 
Change-Id: Iff05b5ea7f535f532eec2af1edf78fdf8acfa21c
 2010-09-24 14:23:31 +08:00