summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am bb5b41a3: am a018cd49: Merge "Add SELinux MAC to DrmManagerService."Nick Kralevich2014-07-253-13/+91
|\ | | | | | | | | * commit 'bb5b41a39f7e93a8df444ae0a1c71495531d265e': Add SELinux MAC to DrmManagerService.
| * am a018cd49: Merge "Add SELinux MAC to DrmManagerService."Nick Kralevich2014-07-253-13/+91
| |\ | | | | | | | | | | | | * commit 'a018cd4926460f8f5ab30a9a11df9775572d8620': Add SELinux MAC to DrmManagerService.
| | * Merge "Add SELinux MAC to DrmManagerService."Nick Kralevich2014-07-233-13/+91
| | |\
| | | * Add SELinux MAC to DrmManagerService.Riley Spahn2014-07-253-13/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SELinux checks on all interfaces exposed by the DrmManagerService. Change-Id: Ib170d3229d88781b76e5fc1c557c8fed233df5d1
* | | | am 0f036bec: Merge "Add multichannel capability to AudioFlinger" into lmp-devAndy Hung2014-07-257-34/+111
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '0f036bec92eca4c972f566355196acc3f4cbf804': Add multichannel capability to AudioFlinger
| * \ \ \ Merge "Add multichannel capability to AudioFlinger" into lmp-devAndy Hung2014-07-247-34/+111
| |\ \ \ \
| | * | | | Add multichannel capability to AudioFlingerAndy Hung2014-07-247-34/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But not enabled (kEnableExtendedChannels == false). Change-Id: I62f7e31fbd29ad703a9a02f5d1a280b6972dd423
* | | | | | am 3eb54c30: Merge "Add multichannel capability to AudioMixer" into lmp-devAndy Hung2014-07-256-175/+420
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '3eb54c30def7f626c5e2d73ab418c78616dc53db': Add multichannel capability to AudioMixer
| * | | | | Merge "Add multichannel capability to AudioMixer" into lmp-devAndy Hung2014-07-246-175/+420
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add multichannel capability to AudioMixerAndy Hung2014-07-246-175/+420
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests/test-mixer updated to handle multichannel. New mixer path is still disabled (kUseNewMixer = false). Subsequent CL will enable multichannel capability. Change-Id: I71dafa94cc1d9af567c285e0ded7c5c94e3ff926
* | | | | | am 9e62beee: Merge "audio policy: clean up checking for active input" into ↵Glenn Kasten2014-07-251-14/+18
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '9e62beeeb307a098be9c72bbd23188a7731b72bb': audio policy: clean up checking for active input
| * | | | | Merge "audio policy: clean up checking for active input" into lmp-devGlenn Kasten2014-07-241-14/+18
| |\ \ \ \ \
| | * | | | | audio policy: clean up checking for active inputGlenn Kasten2014-07-241-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85cc089df32e6d469e8aef307599f1021ea5b835
* | | | | | | am 0a234ea2: Merge "-Making sure mAudioCommands list is empty before going ↵Ricardo Garcia2014-07-251-5/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to sleep. -Wake_lock release before sleeping or quitting threadLoop()." into lmp-dev * commit '0a234ea24a9b03da571150c464c6670fba9d224f': -Making sure mAudioCommands list is empty before going to sleep. -Wake_lock release before sleeping or quitting threadLoop().
| * | | | | | Merge "-Making sure mAudioCommands list is empty before going to sleep. ↵Ricardo Garcia2014-07-241-5/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | -Wake_lock release before sleeping or quitting threadLoop()." into lmp-dev
| | * | | | | | -Making sure mAudioCommands list is empty before going to sleep.Ricardo Garcia2014-07-241-5/+7
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wake_lock release before sleeping or quitting threadLoop(). Change-Id: Icab53d7984a3ba3eaf13e514667b4d60f40cbcd6
* | | | | | | am 319b09d0: Merge "audio policy: add audio_input_flags_t and mOpenRefCount" ↵Glenn Kasten2014-07-254-28/+58
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '319b09d0cf6ae5bc21d8fd1e14e7a9df915514cf': audio policy: add audio_input_flags_t and mOpenRefCount
| * | | | | | Merge "audio policy: add audio_input_flags_t and mOpenRefCount" into lmp-devGlenn Kasten2014-07-244-28/+58
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | audio policy: add audio_input_flags_t and mOpenRefCountGlenn Kasten2014-07-244-28/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f9c7b5ebf03b9bc94efe70d3677edfabb99c194
* | | | | | | am 435e0402: Merge "reset battery stats when media player service is ↵Chong Zhang2014-07-251-0/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | started" into lmp-dev * commit '435e040267c4dd08b4e32b0e7b579902709aa9d6': reset battery stats when media player service is started
| * | | | | | Merge "reset battery stats when media player service is started" into lmp-devChong Zhang2014-07-241-0/+15
| |\ \ \ \ \ \
| | * | | | | | reset battery stats when media player service is startedChong Zhang2014-07-231-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12979595 Change-Id: Ia800de3e65ed4dec8334c6fde566edab12d23c42
* | | | | | | | am f591b865: Merge "StagefrightRecorder: check for WEBM format instead of ↵Robert Shih2014-07-251-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MP4" into lmp-dev * commit 'f591b865552dce57c5b4347974a1ac93c676459e': StagefrightRecorder: check for WEBM format instead of MP4
| * | | | | | | Merge "StagefrightRecorder: check for WEBM format instead of MP4" into lmp-devRobert Shih2014-07-241-5/+5
| |\ \ \ \ \ \ \
| | * | | | | | | StagefrightRecorder: check for WEBM format instead of MP4Robert Shih2014-07-241-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16544665 Change-Id: Idc45bd4cafc65a11132d10fdf21f8439e186f35f
* | | | | | | | | am 858c7517: Merge "signal mFrameAvailableCondition when AudioSource is ↵Chong Zhang2014-07-251-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stopped" into lmp-dev * commit '858c7517abd04c58d2f140df0f27cbad1253e18a': signal mFrameAvailableCondition when AudioSource is stopped Fix initial audio glitch on startup
| * | | | | | | | Merge "signal mFrameAvailableCondition when AudioSource is stopped" into lmp-devChong Zhang2014-07-241-0/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | signal mFrameAvailableCondition when AudioSource is stoppedChong Zhang2014-07-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows last read() to exit properly, otherwise it could get stuck waiting for the condition forever. Bug: 15849309 Change-Id: I79bba53630e59783a5fc041cfc5d3fdb2545cc2c
| | * | | | | | | | Fix initial audio glitch on startupAndy Hung2014-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also happens when restarting AudioFlinger. Bug: 16322824 Change-Id: I382b20174cb0639e04316130141f2094d7dd0cb3
* | | | | | | | | | am f3114588: am cae00fcc: Merge "Remove last user of <cutils/tztime.h>."Elliott Hughes2014-07-250-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f3114588c6f5e725c559537f7eb7995b0d69294b': Remove last user of <cutils/tztime.h>.
| * | | | | | | | | am cae00fcc: Merge "Remove last user of <cutils/tztime.h>."Elliott Hughes2014-07-242-4/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cae00fcc369ff5d08e8ebccf3d2872048579ea83': Remove last user of <cutils/tztime.h>.
| | * | | | | | | | Merge "Remove last user of <cutils/tztime.h>."Elliott Hughes2014-07-232-4/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Remove last user of <cutils/tztime.h>.Elliott Hughes2014-07-242-4/+2
| | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15765976 Change-Id: Ib21abe9349bb1863304cd7618d8fc95ca254e8f6
* | | | | | | | | | am d1365d36: Merge "Camera3: tear down Camera3 streams when they are ↵Zhijun He2014-07-245-2/+21
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted." into lmp-dev * commit 'd1365d3654faedff3b125c794b547daae73d75b8': Camera3: tear down Camera3 streams when they are deleted.
| * | | | | | | | | Merge "Camera3: tear down Camera3 streams when they are deleted." into lmp-devZhijun He2014-07-245-2/+21
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Camera3: tear down Camera3 streams when they are deleted.Zhijun He2014-07-245-2/+21
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also override the disconnectLocked method in Camera3ZslStream to make sure the Camera3ZslStream specific buffer queue is cleaned up properly. Also revert 0be123df1897fd3fe1b7ba30f24d8ae4c91b4dc7, as it was not the right fix. Change-Id: I89bdcb2e206379ae1f2602421e7fdbcde9a31399
* | | | | | | | | | am 37b216c7: Remove last user of <cutils/tztime.h>.Elliott Hughes2014-07-242-4/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '37b216c75ca5e38f1a56a86a95b04ff6b4e71ae7': Remove last user of <cutils/tztime.h>.
| * | | | | | | | | Remove last user of <cutils/tztime.h>.Elliott Hughes2014-07-242-4/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15765976 (cherry picked from commit 56687f7cbf0a3d7909830fc1390a98c713a05e6f) Change-Id: Iacb225584c3acdbb512f46b638a215b75b32cdcb
* | | | | | | | | am 81e50d0c: Reset the value for Vector of pointers.Wei Jia2014-07-241-0/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81e50d0c782cc18eab4ef40ecd6c7f36df50fea5': Reset the value for Vector of pointers.
| * | | | | | | | Reset the value for Vector of pointers.Wei Jia2014-07-241-0/+6
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16467066 Change-Id: I3674e07779a59f4d4fa639d066ed1988df89b3f5
* | | | | | | | am 83b8808f: audio flinger: add patch connection between hw modulesEric Laurent2014-07-2412-233/+890
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '83b8808faad1e91690c64d7007348be8d9ebde73': audio flinger: add patch connection between hw modules
| * | | | | | | audio flinger: add patch connection between hw modulesEric Laurent2014-07-2412-233/+890
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for audio device connections between different audio hw modules. The patch is performed by creating a bridge between the playback thread connected to the sink device and the record thread connected to the source device using a pair of specialized PlaybackTrack and RecordTrack. - Added PatchTrack and PatchRecord classes. - Added TrackBase type to indicate more clearly the track behavior. - A TrackBase can allocate the buffer or reuse an existing one. - Factored some code in openOutput() and openInput() for internal use by PatchPanel. Bug: 14815883. Change-Id: Ib9515fcda864610458a4bc81fa8f59096ff4d7db
* | | | | | | am 9eba0a74: am 3879792f: Merge "Remove 64-bit android_atomic uses from ↵Hans Boehm2014-07-232-12/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StateQueue." * commit '9eba0a74a1fa9aabb7f7078a32c591bc7f0a7168': Remove 64-bit android_atomic uses from StateQueue.
| * | | | | | am 3879792f: Merge "Remove 64-bit android_atomic uses from StateQueue."Hans Boehm2014-07-232-12/+8
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '3879792f62e0d3eac295c703c1968a82022fddb1': Remove 64-bit android_atomic uses from StateQueue.
| | * | | | | Merge "Remove 64-bit android_atomic uses from StateQueue."Hans Boehm2014-07-232-12/+8
| | |\ \ \ \ \
| | | * | | | | Remove 64-bit android_atomic uses from StateQueue.Hans Boehm2014-07-232-12/+8
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use stdatomic.h instead. We're trying to remove android_atomic use wherever possible. The 64-bit uses seem easiest to remove first. This cleans up the code, though not as much as C++ <atomic> would, if it worked everywhere. Change-Id: I3c29bdbd5915cb9d47118834a3a742fe296cf87f
* | | | | | | am c15c2656: audio policy: remove redundant fixed volume managementEric Laurent2014-07-231-8/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'c15c265676da2226a18a5373812608b19d4719d7': audio policy: remove redundant fixed volume management
| * | | | | | audio policy: remove redundant fixed volume managementEric Laurent2014-07-231-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove code handling fixed device volume in AudioPolicyManager::computeVolume() as this is already managed by AudioService. Change-Id: Ib2be7578e40652c85a7d44c685ff9cc703d0c969
* | | | | | | am db2225b2: Merge "NuPlayer: save thread id in MediaPlayer::start" into lmp-devChong Zhang2014-07-231-9/+18
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'db2225b2a24fa4ade5c0353730dc2d6a2f5838d9': NuPlayer: save thread id in MediaPlayer::start
| * | | | | | Merge "NuPlayer: save thread id in MediaPlayer::start" into lmp-devChong Zhang2014-07-231-9/+18
| |\ \ \ \ \ \
generated by cgit v1.1 at 2025-08-08 23:17:34 +0000