193 Commits

Author SHA1 Message Date
Hung-ying Tyan
8635bb5405 am c74d3917: am ece7e11b: Merge "SipService: fix a missing switch-case break." into gingerbread
Merge commit 'c74d39173e1071dbffe713e008b95784ac4312bc'

* commit 'c74d39173e1071dbffe713e008b95784ac4312bc':
  SipService: fix a missing switch-case break.
2010-10-13 17:01:38 -07:00
Hung-ying Tyan
4f8fd10f76 Make SipService listen to WIFI state change events.
+ Grab a WIFI lock if any account is opened to receive calls and WIFI is enabled
+ Release the WIFI lock if no account is opened to receive calls or WIFI is
  disabled
+ Remove screen on/off event receiver

http://b/issue?id=3077454

Change-Id: Ifdf60a850bcf4106c75ec1e7563b26d8b33d7e92
2010-10-13 17:11:58 +08:00
Hung-ying Tyan
f1b1eec9de Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread 2010-10-12 19:44:17 -07:00
Hung-ying Tyan
d6fc979edb SipService: mScreenOn is flipped to wrong value.
http://b/issue?id=3077454

Change-Id: I23b6f70730074689b939e449c2c202ce8ffb586f
2010-10-13 10:25:07 +08:00
Hung-ying Tyan
ebc886c857 Fix SipSessionGroup from throwing ConcurrentModificationException
http://b/issue?id=3087256

Change-Id: I67df64105db7c1295649f1f3ce77f99025ce3d44
2010-10-12 15:41:11 +08:00
Hung-ying Tyan
685b61b711 SipService: fix a missing switch-case break.
Change-Id: I638eecd8000293d4cb37b3595c02ca33df4924eb
2010-10-12 10:46:29 +08:00
Hung-ying Tyan
82b4003871 am df08c2f0: am 692cac9f: SipHelper: add debug log for challenge responses.
Merge commit 'df08c2f03e7cf7be7002d34efe8e4e8d24e406de'

* commit 'df08c2f03e7cf7be7002d34efe8e4e8d24e406de':
  SipHelper: add debug log for challenge responses.
2010-10-11 18:59:05 -07:00
Chung-yih Wang
ec17ab3354 am 833db408: am dc2e5208: Merge "Do not release the wifi lock if the screen is off." into gingerbread
Merge commit '833db40866ebf27be33aa387d08a2cb0b9a4246d'

* commit '833db40866ebf27be33aa387d08a2cb0b9a4246d':
  Do not release the wifi lock if the screen is off.
2010-10-11 10:03:27 -07:00
Hung-ying Tyan
692cac9fdd SipHelper: add debug log for challenge responses.
Change-Id: If0143a0f076ef30b1b8998e477df933923bfa7b1
2010-10-11 11:26:50 +08:00
Chung-yih Wang
e06be94118 am 77880ae4: am 44b7ef54: Merge "SipService: add permission check for using API" into gingerbread
Merge commit '77880ae4187d92506848249585687fc9d0c0dd25'

* commit '77880ae4187d92506848249585687fc9d0c0dd25':
  SipService: add permission check for using API
2010-10-10 14:21:18 -07:00
Hung-ying Tyan
3d59480dc2 am ea445758: am 08faac3c: Unhide SIP API.
Merge commit 'ea445758efba6b728d5e597402e9d9538f3ef451'

* commit 'ea445758efba6b728d5e597402e9d9538f3ef451':
  Unhide SIP API.
2010-10-10 14:19:29 -07:00
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
c7fda188ae Do not release the wifi lock if the screen is off.
We need to be able to receive calls if the device is able to
reassociate with any AP later on.

Change-Id: Ib7aafb98386bf250ed9b5ec0a5b519594efa1649
2010-10-09 08:37:40 +08:00
Hung-ying Tyan
aa562ffdb8 SipService: add permission check for using API
Change-Id: Ifd85ba07f1b913011cb3e80e5027c67bfe3db280
2010-10-08 11:57:18 +08:00
Hung-ying Tyan
08faac3c26 Unhide SIP API.
Change-Id: I09468e3149a242a3b1e085ad220eb74f84ac6c68
2010-10-08 08:31:42 +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
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
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
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
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
Hung-ying Tyan
b031957d52 SipService: turn off verbose logging
Change-Id: I264662ba17d215d532f58b6ee793e569fe67c334
2010-10-01 07:09:30 +08: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
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
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
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
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
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
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