summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge "Use const char correctly in AudioFlinger"Glenn Kasten2011-12-141-3/+3
|\ \ \ \ \
| * | | | | Use const char correctly in AudioFlingerGlenn Kasten2011-12-141-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use const char [] instead of const char * to eliminate unnecessary pointer. Make the array audio_interfaces also const, in addition to the strings. Change-Id: I31f33d1dcb9a657ee136f4280fd2d46492496831
* | | | | Merge "Use units after all times"Glenn Kasten2011-12-141-10/+12
|\ \ \ \ \
| * | | | | Use units after all timesGlenn Kasten2011-12-141-10/+12
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I48d3f29c37228b5d03189e4c9600824c9360cac9
* | | | | Merge "Delete obsolete includes"Glenn Kasten2011-12-141-6/+0
|\ \ \ \ \
| * | | | | Delete obsolete includesGlenn Kasten2011-12-121-6/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I960a179a026ff8d710b43b64cb358f18ee04de16
* | | | | Merge "Remove redundant clear()"Glenn Kasten2011-12-142-3/+0
|\ \ \ \ \
| * | | | | Remove redundant clear()Glenn Kasten2011-12-142-3/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ie5e4e63cbc8fa85ef50451dddf8f149fa864b132
* | | | | Merge "Fix includes"Glenn Kasten2011-12-142-3/+1
|\ \ \ \ \
| * | | | | Fix includesGlenn Kasten2011-12-142-3/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused #include dlfcn.h Add #include String8.h Forward class declaration is only for references and pointers. In this case, we need the full class declaration, and were incorrectly depending on another header file to do it. Change-Id: Iff65cceb3982698cc1ebaeec405695fc190c03ff
* | | | | Merge "AudioTrack::setVolume check range"Glenn Kasten2011-12-141-1/+1
|\ \ \ \ \
| * | | | | AudioTrack::setVolume check rangeGlenn Kasten2011-12-141-1/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ie182bf0f741f1f49f68c02a1e7437a2a34d34fc5
* | | | | am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead ↵James Dong2011-12-147-84/+27
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. * commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec': Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
| * | | | am d70c64db: Revert the following patches because they may lead to power ↵James Dong2011-12-147-84/+27
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. * commit 'd70c64db9f67dbe8f888de6b1bdcc835226ec526': Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
| | * | | Revert the following patches because they may lead to power regression ↵James Dong2011-12-147-84/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. 2. Revert "Fixed the false drm recognition." This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230. 3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones" This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369. 4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9. As a result of the reverting, many ANRs from WV sniffing are back. related-to-bug: 5739618
* | | | | am 16bdd1e6: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * commit '16bdd1e65ef19379bbede40c38de2e9f816ba35b':
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-130-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am 22e50edd: (-s ours) am 3ab63008: Merge "DO NOT MERGE: Support for parsing ↵Andreas Huber2011-12-130-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | of "folded" RTSP header values" into ics-mr1 * commit '22e50edddc2a13fa9cc00f7cc5a5f6471cbece24': DO NOT MERGE: Support for parsing of "folded" RTSP header values
| * | | | am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP ↵Andreas Huber2011-12-132-9/+31
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | header values" into ics-mr1 * commit '3ab630084071eb5dc7f92b4a8a617f8cef10c514': DO NOT MERGE: Support for parsing of "folded" RTSP header values
| | * | | DO NOT MERGE: Support for parsing of "folded" RTSP header valuesAndreas Huber2011-12-132-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and some tweaks to the AMR assembler contributed by Samsung (untested). Change-Id: I6c3df31fa3a35433bfddfdda82747bb4c6ee86a1 related-to-bug: 5669027
* | | | | am da296533: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * commit 'da29653305f299d6390492333a6360cfa78665d9':
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-120-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am 40375099: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-120-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * commit '40375099d10139b6c96c1db8b8295874d60c712e':
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-120-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-090-0/+0
| | |\ \ \
* | | \ \ \ am f14dc291: Merge from ics-mr1The Android Open Source Project2011-12-121-2/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1': Fix drm enumeration order, resolves failure to play forward lock ringtones
| * | | | | Merge from ics-mr1The Android Open Source Project2011-12-121-2/+3
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
| | * | | | Fix drm enumeration order, resolves failure to play forward lock ringtonesJeff Tinker2011-12-091-2/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9 related-to-bug: 5735466
* | | | | am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm ↵Jeff Tinker2011-12-121-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | recognition fix." into ics-mr1 * commit 'dc44e06ef305be8de060af69a468e003e231ba05': Fix drm flag setting missed in false drm recognition fix.
| * | | | am ef664f62: Merge "Fix drm flag setting missed in false drm recognition ↵Jeff Tinker2011-12-091-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | fix." into ics-mr1 * commit 'ef664f62a1525e8f53d0937e889333544ffef3ad': Fix drm flag setting missed in false drm recognition fix.
| | * | | Fix drm flag setting missed in false drm recognition fix.Jeff Tinker2011-12-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie38668c8a32969ef7c7df4ca3350e2364291953c related-to-bug: 5732033
* | | | | am 175d5d76: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-120-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * commit '175d5d76b0aa9808b4214522a6fdf461109560ec':
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-090-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-080-0/+0
| | | |\ \
* | | | \ \ am 406dd5d1: am aadbd80b: Fixed the false drm recognition.James Dong2011-12-122-10/+17
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '406dd5d1e48752177753666867403542e1f400ca': Fixed the false drm recognition.
| * | | | | am aadbd80b: Fixed the false drm recognition.James Dong2011-12-092-10/+17
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'aadbd80b307c817698ce5110ff8e002804d1b230': Fixed the false drm recognition.
| | * | | | Fixed the false drm recognition.James Dong2011-12-082-10/+17
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1 related-to-bug: 5732033
* | | | | Merge "Support for parsing of "folded" RTSP header values and some tweaks to ↵Andreas Huber2011-12-122-9/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | the AMR assembler"
| * | | | | Support for parsing of "folded" RTSP header values and some tweaks to the ↵Andreas Huber2011-12-092-9/+31
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AMR assembler contributed by Samsung (untested). Change-Id: I182561fe0a1a564126bdbb317e96aa52bf525726
* | | | | Fix the build. (Change LOGV to ALOGV)Owen Lin2011-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I14104540cfbd2bcdd7af1534db20554b88c4c0ce
* | | | | am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but ↵Andreas Huber2011-12-092-4/+31
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | queue them for 200ms" into ics-mr1 * commit 'ebfce84f7fd3e25fa08c36b155db91df90a59b3d': Don't perform RTSP seeks right away but queue them for 200ms
| * | | | am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for ↵Andreas Huber2011-12-082-4/+31
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | 200ms" into ics-mr1 * commit '68f592a8210af27df4339089bbee47fb602cae6a': Don't perform RTSP seeks right away but queue them for 200ms
| | * | | Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ↵Andreas Huber2011-12-082-4/+31
| | |\ \ \ | | | | | | | | | | | | | | | | | | ics-mr1
| | | * | | Don't perform RTSP seeks right away but queue them for 200msAndreas Huber2011-12-082-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and only execute the last one. Change-Id: I9ab342396ec9c9c03624a4b0306d1e180ceca000 related-to-bug: 5732960
* | | | | | am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, ↵Andreas Huber2011-12-094-13/+37
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make sure we emulate timestamps" into ics-mr1 * commit 'aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6': Fix Bitreader "putBits" implementation, make sure we emulate timestamps
| * | | | | am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we ↵Andreas Huber2011-12-084-13/+37
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emulate timestamps" into ics-mr1 * commit '0ba9380a337d5e2eae9fd9e4eb8039403ed3815b': Fix Bitreader "putBits" implementation, make sure we emulate timestamps
| | * | | | Fix Bitreader "putBits" implementation, make sure we emulate timestampsAndreas Huber2011-12-084-13/+37
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if we don't receive npt time mapping from the rtsp server (i.e. live stream) Change-Id: I5147d665bd90c9a303ad6ffdafbf770f930f917c related-to-bug: 5660357
generated by cgit v1.1 at 2025-11-03 00:25:07 +0000