summaryrefslogtreecommitdiffstats
path: root/voip
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge "SIP: Fix busy authentication loop." into gingerbreadHung-ying Tyan2010-10-062-35/+30
| |\
| | * SIP: Fix busy authentication loop.Hung-ying Tyan2010-10-072-35/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a retry count and give up after two attempts. Also stop auto registration when server is unreachable. And rename onError() to restartLater() for better readability. http://b/issue?id=3066573 Change-Id: Icfa65c58546a1e2bf8e59e29584a3926c53c479b
* | | resolved conflicts for merge of 4790a2e2 to masterChung-yih Wang2010-10-092-1/+2
|\ \ \ | |/ / | | | | | | Change-Id: I659ccd9a51e24f217f715178a98eaf6592c258d7
| * | Misc fixes for sim-eng build.Chung-yih Wang2010-10-062-1/+2
| |/ | | | | | | Change-Id: I0c5dac1097abc924e66dab92d7d03d5051b4fd29
* | am a785a59c: am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." ↵Hung-ying Tyan2010-10-062-2/+7
|\ \ | |/ | | | | | | | | | | | | | | into gingerbread Merge commit 'a785a59c831256f274627f8f8eb77f9d54508916' * commit 'a785a59c831256f274627f8f8eb77f9d54508916': SIP: add SERVER_UNREACHABLE error code.
| * Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbreadHung-ying Tyan2010-10-042-2/+7
| |\
| | * SIP: add SERVER_UNREACHABLE error code.Hung-ying Tyan2010-10-052-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let SipSession return it when UnknownHostException is caught. Add DisconnectCause.SERVER_UNREACHABLE in Connection and have SipPhone report it when receiving SERVER_UNREACHABLE from SipSession. http://b/issue?id=3061691 Change-Id: I944328ba3ee30c0a9386e89b5c4696d4d9bde000
* | | am 3cb2d3be: am 1862af57: Merge "SipService: supply PendingIntent when open ↵Hung-ying Tyan2010-10-063-64/+74
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | a profile." into gingerbread Merge commit '3cb2d3be6cb501c77c7a5765d954363125857cca' * commit '3cb2d3be6cb501c77c7a5765d954363125857cca': SipService: supply PendingIntent when open a profile.
| * | SipService: supply PendingIntent when open a profile.Hung-ying Tyan2010-10-053-64/+74
| |/ | | | | | | | | | | | | | | | | | | | | The SipService used to take an action string and broadcasts an intent with that action string when an incoming call is received. The design is not safe (as the intent may be sniffed) and inflexible (can only received by BroadcastReceiver). Now we use PendingIntent to fix all these. Companion CL: https://android-git.corp.google.com/g/#change,71800 Change-Id: Id12e5c1cf9321edafb171494932cd936eae10b6e
* | Fix simulator build, part 1/nMarco Nelissen2010-10-062-1/+2
| | | | | | | | Change-Id: If0a42ab262ee6aa6381ce95bd49baf232adb01c5
* | am fbd5a59d: am 4fc04f16: Merge "RTP: Add a baseline echo suppressor." into ↵Chia-chi Yeh2010-10-044-2/+228
|\ \ | |/ | | | | | | | | | | | | | | gingerbread Merge commit 'fbd5a59da9a455bc1c54a80bd5b3afeb426a8e3d' * commit 'fbd5a59da9a455bc1c54a80bd5b3afeb426a8e3d': RTP: Add a baseline echo suppressor.
| * Merge "RTP: Add a baseline echo suppressor." into gingerbreadChia-chi Yeh2010-10-044-2/+228
| |\
| | * RTP: Add a baseline echo suppressor.Chia-chi Yeh2010-10-054-2/+228
| | | | | | | | | | | | Change-Id: I832f1f572f141fd928afe671b12d0b59f2a8e0b1
* | | am 1f34ffd7: am 5cab38ba: Merge "SIP: minor fixes." into gingerbreadHung-ying Tyan2010-10-032-7/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99' * commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99': SIP: minor fixes.
| * | SIP: minor fixes.Hung-ying Tyan2010-10-042-7/+25
| |/ | | | | | | | | | | | | | | + 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
* | am c38e6ae4: am 274e3b5d: Merge "RTP: Start AudioRecord before AudioTrack to ↵Chia-chi Yeh2010-09-301-14/+13
|\ \ | |/ | | | | | | | | | | | | | | avoid being disabled." into gingerbread Merge commit 'c38e6ae40096ec60bc42de663f39dc061b9c90f4' * commit 'c38e6ae40096ec60bc42de663f39dc061b9c90f4': RTP: Start AudioRecord before AudioTrack to avoid being disabled.
| * Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." ↵Chia-chi Yeh2010-09-301-14/+13
| |\ | | | | | | | | | into gingerbread
| | * RTP: Start AudioRecord before AudioTrack to avoid being disabled.Chia-chi Yeh2010-10-011-14/+13
| | | | | | | | | | | | Change-Id: I96be89fda41d77e2cf5bfc1c2f14e2b109001b57
* | | am 9af6b536: am 063d02bb: Merge "SipService: turn off verbose logging" into ↵Hung-ying Tyan2010-09-301-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '9af6b53676061db6fc9c18300dc7d8258f7306ab' * commit '9af6b53676061db6fc9c18300dc7d8258f7306ab': SipService: turn off verbose logging
| * | Merge "SipService: turn off verbose logging" into gingerbreadHung-ying Tyan2010-09-301-1/+2
| |\ \ | | |/ | |/|
| | * SipService: turn off verbose loggingHung-ying Tyan2010-10-011-1/+2
| | | | | | | | | | | | Change-Id: I264662ba17d215d532f58b6ee793e569fe67c334
* | | am 2b133fc0: am 21ae1ad6: RTP: Minor fixes with polishing.Chia-chi Yeh2010-09-303-19/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '2b133fc07533a853f7de23da4f60a766f4233bed' * commit '2b133fc07533a853f7de23da4f60a766f4233bed': RTP: Minor fixes with polishing.
| * | RTP: Minor fixes with polishing.Chia-chi Yeh2010-09-303-19/+20
| |/ | | | | | | Change-Id: I50641373989e512fb489b5017edbcfd7848fe8b9
* | am c79e74ec: am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" ↵Hung-ying Tyan2010-09-301-10/+12
|\ \ | |/ | | | | | | | | | | | | | | into gingerbread Merge commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3' * commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3': Add uri field to SipManager.ListenerRelay
| * Merge "Add uri field to SipManager.ListenerRelay" into gingerbreadHung-ying Tyan2010-09-301-10/+12
| |\
| | * Add uri field to SipManager.ListenerRelayHung-ying Tyan2010-09-301-10/+12
| | | | | | | | | | | | | | | | | | in case mSession is not available. Change-Id: Ifee2c129e48aa1177f648f176413ab6aa5606770
* | | am f6381ec1: am dfd1484e: Merge "RTP: Adjust the jitter buffer to 512ms." ↵Chia-chi Yeh2010-09-301-23/+35
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'f6381ec1da1166e3350d897faae654afb2c21a5a' * commit 'f6381ec1da1166e3350d897faae654afb2c21a5a': RTP: Adjust the jitter buffer to 512ms.
| * | Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbreadChia-chi Yeh2010-09-291-23/+35
| |\ \ | | |/ | |/|
| | * RTP: Adjust the jitter buffer to 512ms.Chia-chi Yeh2010-09-301-23/+35
| | | | | | | | | | | | Change-Id: Ia91c1aa1a03b65dbd329ea98383f370844e2b0c0
* | | am 34552149: am 6a53489a: SipService: add UID check.Hung-ying Tyan2010-09-301-15/+65
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '34552149e4b997d4ed3383fc153faff2bb189066' * commit '34552149e4b997d4ed3383fc153faff2bb189066': SipService: add UID check.
| * | SipService: add UID check.Hung-ying Tyan2010-09-301-15/+65
| |/ | | | | | | | | | | Only allow creator or radio user to access profiles. Change-Id: I548938f117926bcc878419142d1b5d818a4e70df
* | am cbee6229: am 0a537b78: Merge "RTP: Enable AMR codec." into gingerbreadChia-chi Yeh2010-09-303-2/+174
|\ \ | |/ | | | | | | | | | | Merge commit 'cbee622954de5e9e0c07557f8ec9aaa741110043' * commit 'cbee622954de5e9e0c07557f8ec9aaa741110043': RTP: Enable AMR codec.
| * Merge "RTP: Enable AMR codec." into gingerbreadChia-chi Yeh2010-09-293-2/+174
| |\
| | * RTP: Enable AMR codec.Chia-chi Yeh2010-09-303-2/+174
| | | | | | | | | | | | Change-Id: I49e6bdc1b67306b44173f2f346f8372a50264870
* | | am 947d2abd: am 2365b78e: Merge "SIP: misc fixes." into gingerbreadHung-ying Tyan2010-09-303-58/+94
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71' * commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71': SIP: misc fixes.
| * | Merge "SIP: misc fixes." into gingerbreadHung-ying Tyan2010-09-293-58/+94
| |\ \ | | |/ | |/|
| | * SIP: misc fixes.Hung-ying Tyan2010-09-303-58/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 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
* | | am 1c2eab2d: am 955ab37c: Merge "RTP: Enable GSM-EFR codec." into gingerbreadChia-chi Yeh2010-09-304-3/+110
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1c2eab2d86faa9c647a9893f761a50cfa28d9d57' * commit '1c2eab2d86faa9c647a9893f761a50cfa28d9d57': RTP: Enable GSM-EFR codec.
| * | RTP: Enable GSM-EFR codec.Chia-chi Yeh2010-09-304-3/+110
| | | | | | | | | | | | Change-Id: I9d84009e4557a0a82c1f9d7d543922741be97c77
* | | am 1254b9c5: am cd386649: Merge "RTP: Revise the workaround of private ↵Chia-chi Yeh2010-09-291-27/+24
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | addresses and fix bugs." into gingerbread Merge commit '1254b9c534c5f027f8928fbb3e743e57d55bd13d' * commit '1254b9c534c5f027f8928fbb3e743e57d55bd13d': RTP: Revise the workaround of private addresses and fix bugs.
| * | RTP: Revise the workaround of private addresses and fix bugs.Chia-chi Yeh2010-09-301-27/+24
| | | | | | | | | | | | Change-Id: Ie654b569f47049aa452eca8d3e6d4a98ac18469c
* | | am ebfe5632: am e006e4d2: Merge changes Iae1913fb,I38dbefef into gingerbreadChia-chi Yeh2010-09-285-123/+224
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Merge commit 'ebfe5632db275a89b49ab828064ba90db59702cf' * commit 'ebfe5632db275a89b49ab828064ba90db59702cf': RTP: Enable GSM codec. RTP: Refactor out G711 codecs into another file.
| * | Merge changes Iae1913fb,I38dbefef into gingerbreadChia-chi Yeh2010-09-285-123/+224
| |\ \ | | |/ | |/| | | | | | | | | | * changes: RTP: Enable GSM codec. RTP: Refactor out G711 codecs into another file.
| | * RTP: Enable GSM codec.Chia-chi Yeh2010-09-294-4/+84
| | | | | | | | | | | | Change-Id: Iae1913fb0643f1c66b5d16f24d51924d363e5ef5
| | * RTP: Refactor out G711 codecs into another file.Chia-chi Yeh2010-09-293-120/+141
| | | | | | | | | | | | Change-Id: I38dbefef2315a28d44683e86a51e69f38e3f20ec
* | | am df31e03c: am 320cdcb1: Merge "RTP: Delay the initialization of AudioTrack ↵Chia-chi Yeh2010-09-281-133/+123
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | and AudioRecord." into gingerbread Merge commit 'df31e03c47cd4caf45d8a58cf1fe5893da48ec6c' * commit 'df31e03c47cd4caf45d8a58cf1fe5893da48ec6c': RTP: Delay the initialization of AudioTrack and AudioRecord.
| * | Merge "RTP: Delay the initialization of AudioTrack and AudioRecord." into ↵Chia-chi Yeh2010-09-281-133/+123
| |\ \ | | | | | | | | | | | | gingerbread
| | * | RTP: Delay the initialization of AudioTrack and AudioRecord.Chia-chi Yeh2010-09-291-133/+123
| | |/ | | | | | | | | | | | | | | | Related to http://b/3043844. Change-Id: I2c4fd9f64e6eba597d68b2ea1ceeff83103697db
* | | am 0d447760: am 6d028dd2: Merge "SIP: Feedback any provisional responses in ↵Hung-ying Tyan2010-09-281-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | addition to RING" into gingerbread Merge commit '0d44776016cecf1c7c826c4784f8f867a56235f0' * commit '0d44776016cecf1c7c826c4784f8f867a56235f0': SIP: Feedback any provisional responses in addition to RING
| * | SIP: Feedback any provisional responses in addition to RINGHung-ying Tyan2010-09-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | The only exception is TRYING. Also remove an unused import in SipSessionGroup. http://b/issue?id=3021865 Change-Id: I160982b0c4b417362f1fb961217db90c3a585ce5