summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 7a8671bc: Merge from gingerbreadandroid-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseJean-Baptiste Queru2011-04-111-1/+2
|\
| * Merge from gingerbreadJean-Baptiste Queru2011-04-071-1/+2
| |\
| | * Fix the maddr issue for proxy authentication.android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9gingerbread-releasegingerbread-mr4-releasegingerbreadChung-yih Wang2011-04-071-1/+2
* | | am 4794d8f3: reconcile with gingerbreadJean-Baptiste Queru2011-02-100-0/+0
|\| |
| * | reconcile with gingerbreadJean-Baptiste Queru2011-02-090-0/+0
| |\|
| | * Max-Forwards is actually optional.android-2.3.3_r1.1android-2.3.3_r1Chia-chi Yeh2011-02-091-0/+4
| | * Only add maddr to the uri when it is different from the host.Chia-chi Yeh2011-02-091-0/+3
* | | am 4842dc69: Max-Forwards is actually optional.Chia-chi Yeh2010-12-191-0/+4
|\| |
| * | Max-Forwards is actually optional.Chia-chi Yeh2010-12-181-0/+4
* | | am 2ad6621e: Only add maddr to the uri when it is different from the host.Chia-chi Yeh2010-12-191-0/+3
|\| |
| * | Only add maddr to the uri when it is different from the host.Chia-chi Yeh2010-12-181-0/+3
* | | am feddf84a: merge snapshotThe Android Open Source Project2010-12-010-0/+0
|\| |
| * | merge snapshotThe Android Open Source Project2010-11-300-0/+0
| |\ \ | | |/ | |/|
| | * snapshotThe Android Open Source Project2010-11-30514-0/+83764
* | am bbc3513f: New implementations of interfaces.Jesse Wilson2010-10-292-0/+58
|\|
| * New implementations of interfaces.android-2.3_r1android-2.3.2_r1android-2.3.1_r1Jesse Wilson2010-10-292-0/+58
* | am 9f8804b2: Remove two files.Elliott Hughes2010-10-290-0/+0
|\|
| * Remove two files.Elliott Hughes2010-10-290-0/+0
* | am 2bbfb895: Set the name of UDPMessageChannel threads for identification.Chung-yih Wang2010-10-191-0/+1
|\|
| * Set the name of UDPMessageChannel threads for identification.Chung-yih Wang2010-10-181-0/+1
* | am d53c0f34: (-s ours) Removed unused files. Do not merge.Chung-yih Wang2010-10-090-0/+0
|\|
| * Removed unused files. Do not merge.Chung-yih Wang2010-10-0719-4042/+0
* | am 14bb68e6: (-s ours) Remove unused files. Do not merge.Chung-yih Wang2010-10-090-0/+0
|\|
| * Remove unused files. Do not merge.Chung-yih Wang2010-10-072-110/+0
* | Cleanup the unused files in nist-sip.Chung-yih Wang2010-10-07566-68566/+0
* | am 04c2bda0: nist-sip: remove javax.sdp.Chia-chi Yeh2010-09-2378-10811/+6
|\|
| * nist-sip: remove javax.sdp.Chia-chi Yeh2010-09-2378-10811/+6
* | RTP: remove dead code. Now we are officially in the frameworks.Chia-chi Yeh2010-08-0621-3456/+0
* | RTP: prepare for moving into frameworks.Chia-chi Yeh2010-08-061-1/+1
* | am c05783e9: Merge changes I45517c7b,Ib13825c9 into gingerbreadChung-yih Wang2010-08-051-17/+15
|\|
| * Merge changes I45517c7b,Ib13825c9 into gingerbreadChung-yih Wang2010-08-051-17/+15
| |\
| | * Fix the build.Chung-yih Wang2010-08-061-17/+15
| | * Cherry-pick the change from master for the setRPort in Via header.Chung-yih Wang2010-08-051-5/+4
* | | am 4b560d4a: Cherrypick the change for setRPort() in Via header.Chung-yih Wang2010-08-050-0/+0
|\| |
| * | Cherrypick the change for setRPort() in Via header.Chung-yih Wang2010-08-051-5/+4
| |/
* | Merge "SIP: the low volume problem when setting IN_CALL mode."Alan Huang2010-08-041-0/+2
|\ \
| * | SIP: the low volume problem when setting IN_CALL mode.Alan Huang2010-08-051-0/+2
* | | Generated hdpi drawable size reducedGilles Debunne2010-08-0310-0/+0
* | | external/nist-sip/ : added scaled hdpi version of assets that were moved to d...Gilles Debunne2010-08-0310-0/+0
|/ /
* | Move pngs from drawable to drawable-mdpi in project external/nist-sip/Gilles Debunne2010-08-0210-0/+0
* | Add the missing functions for compatibility.Chung-yih Wang2010-07-282-1/+22
* | Fix autoregistration bug.Chung-yih Wang2010-07-281-0/+1
* | SIP: demo app: pass on phone number when OutgoingCallReceiver cannot handle it.Hung-ying Tyan2010-07-271-1/+1
* | SIP telephony: fix call log and connection stats.Hung-ying Tyan2010-07-264-44/+158
* | SIP: fix WakeupTimer.recalculatePeriods().Hung-ying Tyan2010-07-231-18/+30
* | SipService: fix NAT binding lifetime measurement.Hung-ying Tyan2010-07-232-5/+26
* | SIP: fix a bug in WakeupTimer.cancel()Hung-ying Tyan2010-07-231-9/+21
* | SIP telephony: clean up TODO's. B)Hung-ying Tyan2010-07-232-10/+1
* | SipSessionGroup: generating 32-bit random number for tag.Hung-ying Tyan2010-07-231-5/+4
* | SipSessionImpl: add MinExpiresHeader check.Hung-ying Tyan2010-07-231-1/+6