Chia-chi Yeh
6b762aaa8d
resolved conflicts for merge of 2b652855 to master
...
Change-Id: I3604c95530823605d66cb56be7a37c55399a9271
2010-09-23 14:59:58 +08:00
repo sync
84f7f6ba39
SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
...
Change-Id: I7efff4f29ca84c3e7c17ef066b7186b514a777b2
2010-09-23 14:07:45 +08:00
Chia-chi Yeh
e6c0c10958
SDP: Add a simple class to help manipulate session descriptions.
...
Change-Id: I1631ee20e8b4a9ad8e2184356b5d13de66e03db1
2010-09-23 13:31:01 +08:00
Chia-chi Yeh
37adc522f6
RTP: Add two getters to retrieve the current configuration from AudioStream.
...
Change-Id: Iff588130653242f6ddd6a6b663df775ecb276768
2010-09-23 03:34:14 +08:00
Chia-chi Yeh
32e106b7bd
RTP: Extend codec capability and update the APIs.
...
Change-Id: I37ba9d83c2de3c5dae2bfc1b7513df7f6fee3c5c
2010-09-23 03:32:04 +08:00
Hung-ying Tyan
5491c7a076
am 852e5354: am 8544560c: SipPhone: fix missing-call DisconnectCause feedback
...
Merge commit '852e5354f60a0131692c46f509c2e9901b0b6810'
* commit '852e5354f60a0131692c46f509c2e9901b0b6810':
SipPhone: fix missing-call DisconnectCause feedback
2010-09-20 00:58:08 -07:00
Hung-ying Tyan
8544560ccc
SipPhone: fix missing-call DisconnectCause feedback
...
also fix delivering bad news before closing a SipAudioCallImpl object so that
apps can get the current audio-call object state before it's closed:
http://b/issue?id=3009262
Change-Id: I94c19dae8b4f252de869e614ec462b19b4ff2077
2010-09-20 13:06:30 +08:00
Hung-ying Tyan
2417132611
am 37d1b249: am 97963794: SIP: convert enum to static final int.
...
Merge commit '37d1b2496ed4e636062d8bb451e723b975c80920'
* commit '37d1b2496ed4e636062d8bb451e723b975c80920':
SIP: convert enum to static final int.
2010-09-19 18:59:43 -07:00
Hung-ying Tyan
97963794af
SIP: convert enum to static final int.
...
Converts SipErrorCode and SipSessionState.
Change-Id: Iee3a465649ea89d395b2336bbd673c25113e5f93
2010-09-20 09:51:31 +08:00
Hung-ying Tyan
03d8a8f1f7
resolved conflicts for merge of cf1620d6 to master
...
Change-Id: I7a1436ec4c6a96801c096f61e9dc3571c1927cae
2010-09-20 09:31:12 +08:00
Hung-ying Tyan
c4b87477c0
SIP: add config flag for wifi-only configuration.
...
http://b/issue?id=2994029
Change-Id: I328da9b0f8b70d660dbcefffdac8250341792101
2010-09-20 08:03:20 +08:00
Hung-ying Tyan
e30fc66305
Fix build.
...
Change-Id: Icb6faa2ed6428d9db7f880a1855ce01d8cd22495
2010-09-17 18:23:26 +08:00
Hung-ying Tyan
93f39477c1
Fix build
...
Change-Id: If2fdfcb6da3a1cf5f0d62ddfc0f2c98be55b32a7
2010-09-17 17:42:19 +08: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
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
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
Hung-ying Tyan
3cd497ce00
am 6962aff3: am 698ddb0c: Merge "Fix links in SIP API javadoc." into gingerbread
...
Merge commit '6962aff36be9d91ad40ead326bd54fc90965f6f0'
* commit '6962aff36be9d91ad40ead326bd54fc90965f6f0':
Fix links in SIP API javadoc.
2010-09-15 17:53:53 -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
286bb5a00b
Fix links in SIP API javadoc.
...
Change-Id: I839280fe18502bb576f6e9c9a7948077c02fa570
2010-09-16 03:52:10 +08:00
Hung-ying Tyan
fbfb6f2f04
am 188a8f1b: am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread
...
Merge commit '188a8f1b72452bc294daa2186e93771543be0478'
* commit '188a8f1b72452bc294daa2186e93771543be0478':
SipService: ignore connect event for non-active networks.
2010-09-15 07:08:38 -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
fcc7fb8a1a
am 3692af92: am 99bf4e45: SIP: remove dependency on javax.sip
...
Merge commit '3692af92ab290a561a927079cbf1f778f57fe5f9'
* commit '3692af92ab290a561a927079cbf1f778f57fe5f9':
SIP: remove dependency on javax.sip
2010-09-15 07:07:56 -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
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
Hung-ying Tyan
12bec5ddf5
SipService: ignore connect event for non-active networks.
...
+ sanity check and remove redundant code.
Change-Id: I4d3e226851ad7fc4d88ddcd0a5c58f7e33b6c14a
2010-09-15 00:49:02 +08: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
Hung-ying Tyan
99bf4e45c4
SIP: remove dependency on javax.sip
...
and change errorCodeString to errorCode in
SipRegistrationListener.onRegistrationFailed().
Change-Id: Id9618f5a4b0effaed04f8b0dc60347499d9e4501
2010-09-14 20:29:02 +08: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
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
25b52a2f97
SIP: remove dependency on javax.sip.SipException.
...
Change-Id: I77d289bef1b5e7f1ec0c0408d0bbf96c21085cd7
2010-09-13 16:50:12 +08:00
Hung-ying Tyan
a97ccc02e1
am 5f93c39c: am ca3c24db: Merge "SIP: add SipErrorCode for error feedback." into gingerbread
...
Merge commit '5f93c39cdb2f75dda805691987ccd4e570f6cb74'
* commit '5f93c39cdb2f75dda805691987ccd4e570f6cb74':
SIP: add SipErrorCode for error feedback.
2010-09-10 02:31:05 -07:00
Hung-ying Tyan
903e103160
SIP: add SipErrorCode for error feedback.
...
Change-Id: I8b071d4933479b780a403d0bfa30511f4c23ca8f
2010-09-10 17:15:06 +08:00
Hung-ying Tyan
3559d1d1fc
am ea16e72b: am b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
...
Merge commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d'
* commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d':
SipManager: always return true for SIP API and VOIP support query.
2010-09-02 19:30:16 -07:00
Hung-ying Tyan
643fce9781
SipManager: always return true for SIP API and VOIP support query.
...
Change-Id: I397a804e0aa598aee77a8ce28ada1b11e10fbaea
http://b/issue?id=2972054
2010-09-03 10:19:23 +08:00
repo sync
3d67c5688f
resolved conflicts for merge of 12eaf9d5 to master
...
Change-Id: Icb706bdf350a9c471070fa3e2296cde77ef3703d
2010-09-03 00:24:26 +08:00
Chia-chi Yeh
dc296b0d4b
Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread
2010-09-02 08:13:01 -07:00
Chia-chi Yeh
95b15c3560
SipService: reduce the usage of javax.sdp.*.
...
After this change, SipAudioCallImpl is the only place still using it.
Change-Id: I5693bffa54f9e19cbfa70b45dfcf40fba04dedbb
2010-09-02 22:15:26 +08:00
Hung-ying Tyan
e93a492166
am 18dfae22: am 60264b30: SipProfile: remove outgoingCallAllowed flag.
...
Merge commit '18dfae226b0f9d3983226eb6cd377fc937b30730'
* commit '18dfae226b0f9d3983226eb6cd377fc937b30730':
SipProfile: remove outgoingCallAllowed flag.
2010-09-02 05:43:59 -07:00
Hung-ying Tyan
60264b3064
SipProfile: remove outgoingCallAllowed flag.
...
Change-Id: I37a215bafce57adf6911c81fd38db324bac686ec
2010-09-02 20:34:17 +08:00
Hung-ying Tyan
f83d4f1779
resolved conflicts for merge of 3e4975a5 to master
...
Change-Id: Icd382fc43c8a1975801ab42eb184b633520149c7
2010-09-02 09:56:04 +08:00
Hung-ying Tyan
3424c02e6b
Add software features for SIP and VOIP
...
and block SipService creation and SIP API if the feature is not available.
Change-Id: Icf780af1ac20dda4d8180cea3e5b20e21a8350bc
2010-09-02 08:10:13 +08:00
Chung-yih Wang
b6d4723aab
Revert "Add Wifi High Perf. mode during a call."
...
This reverts commit 0858806ffc .
Change-Id: I0432ac7af6e0becf196728190b71dfe82ce63cd0
2010-08-26 16:37:10 +08:00
Chung-yih Wang
0858806ffc
Add Wifi High Perf. mode during a call.
...
To prevent the wifi from entering low-power mode due to the screen off
triggered by the proximity sensor.
Change-Id: I490bc594d800bc30c256e52ef3bce08bf86bc7b1
2010-08-26 15:05:48 +08:00
Chung-yih Wang
5424c8dcac
Add dynamic uid info for tracking the sip service usage.
...
Change-Id: Ibc340401b63799326b08aee6eba602a3e753b13f
2010-08-26 10:12:05 +08:00
Hung-ying Tyan
37f709aeb0
Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread
2010-08-24 23:57:50 -07:00
Hung-ying Tyan
cf95f5d263
SipProfile: add isOutgoingCallAllowed() and new builder constructor
...
Change-Id: I7ced47079fd2b00c7160b152eb4c1d34399e39dc
2010-08-24 21:32:10 +08:00
Hung-ying Tyan
3294d44b96
Add confcall management to SIP calls
...
and fix the bug of re-assigning connectTime's in SipConnection,
and adding synchronization for SipPhone to be thread-safe,
and set normal audio mode when call not on hold instead of on hold in SipAudioCallImpl,
and fix re-entrance problem in CallManager.setAudioMode() for in-call mode.
Change-Id: I54f39dab052062de1ce141e5358d892d30453a3a
2010-08-24 17:54:47 +08:00