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

114 Commits

Author SHA1 Message Date
Hung-ying Tyan
c7e4b2d5bb am 841d6ff9: am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread 
Merge commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32'

* commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32':
  Make SipService broadcast SIP_SERVICE_UP when it's up.
 2010-10-08 18:28:20 -07:00
Hung-ying Tyan
1d8db8a0a8 am 909a974f: am 16c29bd7: Merge "SIP: Fix busy authentication loop." into gingerbread 
Merge commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e'

* commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e':
  SIP: Fix busy authentication loop.
 2010-10-08 17:58:55 -07:00
Chung-yih Wang
7ff6f97f84 resolved conflicts for merge of 4790a2e2 to master 
Change-Id: I659ccd9a51e24f217f715178a98eaf6592c258d7
 2010-10-09 08:07:55 +08:00
Hung-ying Tyan
9db99a4dc1 Make SipService broadcast SIP_SERVICE_UP when it's up. 
http://b/issue?id=3062010

Change-Id: I13419fa3a8fdfba1977260f703e4dcaa42a6606c
 2010-10-07 09:15:25 +08:00
Hung-ying Tyan
16c29bd7f2 Merge "SIP: Fix busy authentication loop." into gingerbread 2010-10-06 17:29:28 -07:00
Hung-ying Tyan
f209cd7062 am a785a59c: am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread 
Merge commit 'a785a59c831256f274627f8f8eb77f9d54508916'

* commit 'a785a59c831256f274627f8f8eb77f9d54508916':
  SIP: add SERVER_UNREACHABLE error code.
 2010-10-06 17:08:43 -07:00
Hung-ying Tyan
828c89ba8e am 3cb2d3be: am 1862af57: Merge "SipService: supply PendingIntent when open a profile." into gingerbread 
Merge commit '3cb2d3be6cb501c77c7a5765d954363125857cca'

* commit '3cb2d3be6cb501c77c7a5765d954363125857cca':
  SipService: supply PendingIntent when open a profile.
 2010-10-06 17:08:34 -07:00
Hung-ying Tyan
ee8a884f35 SIP: Fix busy authentication loop. 
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
 2010-10-07 07:04:46 +08:00
Marco Nelissen
fd1e4ad52c Fix simulator build, part 1/n 
Change-Id: If0a42ab262ee6aa6381ce95bd49baf232adb01c5
 2010-10-06 12:23:02 -07:00
Chung-yih Wang
fb116fbea3 Misc fixes for sim-eng build. 
Change-Id: I0c5dac1097abc924e66dab92d7d03d5051b4fd29
 2010-10-06 16:46:59 +08:00
Hung-ying Tyan
718e0033e6 Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread 2010-10-04 23:03:26 -07:00
Hung-ying Tyan
c6548fd9ed SIP: add SERVER_UNREACHABLE error code. 
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
 2010-10-05 13:30:28 +08:00
Hung-ying Tyan
323d3671ac SipService: supply PendingIntent when open a profile. 
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
 2010-10-05 10:13:25 +08:00
Chia-chi Yeh
e1ccf7c953 am fbd5a59d: am 4fc04f16: Merge "RTP: Add a baseline echo suppressor." into gingerbread 
Merge commit 'fbd5a59da9a455bc1c54a80bd5b3afeb426a8e3d'

* commit 'fbd5a59da9a455bc1c54a80bd5b3afeb426a8e3d':
  RTP: Add a baseline echo suppressor.
 2010-10-04 11:57:33 -07:00
Chia-chi Yeh
4fc04f160f Merge "RTP: Add a baseline echo suppressor." into gingerbread 2010-10-04 11:51:45 -07:00
Chia-chi Yeh
a8a10096a1 RTP: Add a baseline echo suppressor. 
Change-Id: I832f1f572f141fd928afe671b12d0b59f2a8e0b1
 2010-10-05 02:47:00 +08:00
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