Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,871 Commits 3 Branches 0 Tags
6b762aaa8d24e9dcd91c69eaced417f688894add
Commit Graph

28 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Chung-yih Wang
cfd15dd3c8 Fix the IN_CALL mode issue. 
If the sip call is on-holding, we should not set the audio to
MODE_NORMAL, or it will affect the audio if there is an active pstn
call.

Change-Id: If1bcba952617bf8427bc9e2d64d483ba1ee37370
 2010-08-16 18:02:31 +08:00
Hung-ying Tyan
ea4de5bd25 SipAudioCall: perform local ops before network op in endCall() 
Change-Id: I1808f715d56c0979cea7741cb5bdb3831774d3ef
 2010-08-10 13:23:12 +08:00
Chung-yih Wang
363c2ab82c Move the sip related codes to framework. 
Change-Id: Ib81dadc39b73325c8438f078c7251857a83834fe
 2010-08-05 10:25:53 +08:00