summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.4_r1' into cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0Ricardo Cerqueira2013-11-011-17/+23
|\
| * AudioRecord must be used as sp<> onlyGlenn Kasten2013-06-131-10/+10
| * AudioTrack::obtainBuffer() and AudioRecord::obtainBuffer are now deprecatedGlenn Kasten2013-06-061-2/+8
| * Use sp<AudioTrack> instead of raw AudioTrack *Glenn Kasten2013-05-311-7/+7
* | voip: Add TLS support to the Android SIP stackcm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Emilio López2013-09-153-2/+6
|/
* Add liblogYing Wang2013-04-091-0/+1
* Delete frameworks/base/voip use voip-common from frameworks/opt/net/voipWink Saville2013-01-2839-0/+140
* Temporarily delete jni/rtp/Android.mkWink Saville2013-01-281-59/+0
* Merge voip from platform/frameworks/base toChad Jones2013-01-2837-0/+11349
|\
| * Add debug and some cleanupWink Saville2013-01-229-344/+499
| * am 9813e365: am 940ad4aa: Merge "Make AudioGroup.add locale safe"Elliott Hughes2012-11-301-1/+2
| |\
| | * Make AudioGroup.add locale safeJohan Redestig2012-11-191-1/+2
| * | Use size_t for frame countGlenn Kasten2012-11-151-2/+2
| * | Remove obsolete references to libmedia_nativeGlenn Kasten2012-10-301-1/+0
| |/
| * am f66603e1: am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription l...Jean-Baptiste Queru2012-09-061-1/+2
| |\
| | * Make SimpleSessionDescription locale safeJohan Redestig2012-08-291-1/+2
| * | Use audio_channel_mask_t more consistentlyGlenn Kasten2012-07-031-1/+1
| |/
| * Reconcile with jb-releaseThe Android Open Source Project2012-06-220-0/+0
| |\
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-220-0/+0
| | |\
| * | | am 9be0105f: docs: fix several linksScott Main2012-06-221-1/+1
| |\| | | | |/ | |/|
| | * docs: fix several linksScott Main2012-06-221-1/+1
| * | merge in jb-release history after reset to masterThe Android Automerger2012-04-050-0/+0
| |\ \ | | |/ | |/|
| | * merge in jb-release history after reset to masterThe Android Automerger2012-04-020-0/+0
| | |\
| | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-290-0/+0
| | | |\
| | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-280-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-260-0/+0
| | | | | |\
| | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-211-0/+1
| | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-201-1/+0
| * | | | | | Merge "SIP: push the logic of finding local address down to SipSessionGroup."Chia-chi Yeh2012-04-042-89/+60
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | SIP: push the logic of finding local address down to SipSessionGroup.Chia-chi Yeh2012-04-042-89/+60
| | |/ / / /
| * / / / / RTP: refactor a little bit and fix few minor bugs.Chia-chi Yeh2012-03-305-55/+54
| |/ / / /
| * / / / frameworks base Android.mk file changesJames Dong2012-03-281-6/+6
| |/ / /
| * | | Merge "RTP: add a null-check in AudioStream.setDtmfType()."Chia-chi Yeh2012-03-271-1/+1
| |\ \ \
| | * | | RTP: add a null-check in AudioStream.setDtmfType().Chia-chi Yeh2012-03-271-1/+1
| | |/ /
| * / / move hardware feature definitionsColin Cross2012-03-261-21/+0
| |/ /
| * | Merge remote-tracking branch 'goog/ics-aah-exp' into mergeMike Lockwood2012-03-220-0/+0
| |\ \
| | * \ am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE,...Joe Fernandez2011-12-224-3/+30
| | |\ \
| | * \ \ am bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1Chia-chi Yeh2011-11-214-40/+47
| | |\ \ \
| | * | | | am 71f2cf11: (-s ours) Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-9/+9
| * | | | | Merge "Whitespace"Glenn Kasten2012-03-211-3/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | WhitespaceGlenn Kasten2012-03-191-3/+3
| * | | | | Add libmedia_nativeGlenn Kasten2012-03-161-0/+1
| |/ / / /
| * | | | Remove dependency on audio_* locationGlenn Kasten2012-03-141-1/+1
| * | | | am 45470559: (-s ours) am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF)...Jean-Baptiste Queru2012-01-200-0/+0
| |\ \ \ \
| | * \ \ \ am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"Jean-Baptiste Queru2012-01-192-17/+17
| | |\ \ \ \
| | | * | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-192-17/+17
| * | | | | | am db2b3930: (-s ours) am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF)...Jean-Baptiste Queru2012-01-200-0/+0
| |\| | | | |
| | * | | | | am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"Jean-Baptiste Queru2012-01-191-1/+1
| | |\| | | |
| | | * | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-191-1/+1
| * | | | | | am dde686e2: (-s ours) am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF)...Jean-Baptiste Queru2012-01-200-0/+0
| |\| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-15 06:35:42 +0000