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

74 Commits

Author SHA1 Message Date
Hung-ying Tyan
6d848f759e am bdc15d8b: am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread 
Merge commit 'bdc15d8b43e7763bf72780d0f683b223b8cf6625'

* commit 'bdc15d8b43e7763bf72780d0f683b223b8cf6625':
  Add permission requirements to SipAudioCall and SipManager javadoc.
 2010-10-21 13:44:06 -07:00
Hung-ying Tyan
164cd438fb am 51028569: am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread 
Merge commit '5102856947595cffc1cceb11b9e4c5baf70b2e82'

* commit '5102856947595cffc1cceb11b9e4c5baf70b2e82':
  Remove ringtone API from SipAudioCall.
 2010-10-21 10:55:33 -07:00
Hung-ying Tyan
e87b644402 Add permission requirements to SipAudioCall and SipManager javadoc. 
Bug: 3116259

Change-Id: I00a033794e9d3e1c2d2ccfe4e612cd50003ec2ee
 2010-10-21 03:27:20 +08:00
Hung-ying Tyan
9b449e5606 Remove ringtone API from SipAudioCall. 
(watch out auto-merge conflict for SipAudioCall).

Bug: 3113033, related CL: https://android-git/g/#change,75185

Change-Id: Ib48d3b990e229e0b341e47e10e76934e1a50d10f
 2010-10-20 22:51:22 +08:00
John Huang
78c206c750 am 085996c4: am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread 
Merge commit '085996c411b4d3878dfd97c59bfc4a17da08959b'

* commit '085996c411b4d3878dfd97c59bfc4a17da08959b':
  Uncomment SIP/VOIP feature check in SipManager.
 2010-10-19 09:54:16 -07:00
Hung-ying Tyan
a0cdfbf5b7 Uncomment SIP/VOIP feature check in SipManager. 
http://b/issue?id=2971947

Change-Id: I3afa8eb03c4e347b382213dd388354365f766b2f
 2010-10-18 19:48:04 +08: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
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
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
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
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
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
a6f950c968 RTP: Enable GSM codec. 
Change-Id: Iae1913fb0643f1c66b5d16f24d51924d363e5ef5
 2010-09-29 10:36:52 +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
Hung-ying Tyan
fd144d7667 Merge "SipAudioCall: remove SipManager dependency." into gingerbread 2010-09-27 10:54:27 -07:00
Hung-ying Tyan
00a22064ef SipService: handle cross-domain authentication error 
and add new CROSS_DOMAIN_AUTHENTICATION error code and OUT_OF_NETWORK
DisconnectCause.

http://b/issue?id=3020185

Change-Id: Icc0a341599d5a72b7cb2d43675fbddc516544978
 2010-09-27 10:45:24 -07:00
Hung-ying Tyan
3a4197e642 SipAudioCall: remove SipManager dependency. 
Change-Id: I2dc8bf427e52f64529ee0e0261362b975a8917c6
 2010-09-24 23:27:40 +08:00
Hung-ying Tyan
a97c5f7779 Merge "fix build" 2010-09-23 23:24:35 -07:00
Hung-ying Tyan
fb0264096e fix build 
Change-Id: Iff05b5ea7f535f532eec2af1edf78fdf8acfa21c
 2010-09-24 14:23:31 +08:00
Chia-chi Yeh
658bec9567 SDP: remove dead code. 
Change-Id: I2a5764a2b9cabc54b0ac18666e494c1cb39c4e9b
 2010-09-24 10:17:42 +08:00
Hung-ying Tyan
84a357bb6a Refactoring SIP classes to get ready for API review. 
+ replace SipAudioCall and its Listener interfaces with real implementations,
  + remove SipAudioCallImpl.java, most of it is has become part of SipAudioCall,
+ add SipSession and its Listener classes to wrap ISipSession and ISipSessionListener,
+ move SipSessionState to SipSession.State,
+ make SipManager keep context and remove the context argument from many methods of its,
+ rename SipManager.getInstance() to newInstance(),
+ rename constant names for action strings and extra keys to follow conventions,
+ set thread names for debugging purpose.

Change-Id: Ie1790dc0e8f49c06c7fc80d33fec0f673a9c3044
 2010-09-24 10:06:59 +08:00
repo sync
0b7d6de155 Fix the build. 
Change-Id: I82210cb2d41f532583f83ea17e6f2d8d49280a30
 2010-09-23 14:52:24 +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
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
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
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
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
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
286bb5a00b Fix links in SIP API javadoc. 
Change-Id: I839280fe18502bb576f6e9c9a7948077c02fa570
 2010-09-16 03:52:10 +08: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