summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am cebe2085: am dd235727: GenericSource: implement getTrackCount/getTrackInfoRobert Shih2014-07-173-3/+68
|\ | | | | | | | | * commit 'cebe2085b0c0ee2c42e8972b5aab28b59c29684b': GenericSource: implement getTrackCount/getTrackInfo
| * am dd235727: GenericSource: implement getTrackCount/getTrackInfoRobert Shih2014-07-173-3/+68
| |\ | | | | | | | | | | | | * commit 'dd235727a1b4e283deeb581559f99c2c8889da07': GenericSource: implement getTrackCount/getTrackInfo
| | * GenericSource: implement getTrackCount/getTrackInfoRobert Shih2014-07-163-3/+68
| | | | | | | | | | | | | | | Bug: 15153976 Change-Id: I0204c4188d485cda026497469c7cde24f7bd5c95
* | | am e493afff: am d81d4896: Merge "Add audio_input_flags_t to HAL ↵Glenn Kasten2014-07-171-2/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | open_input_stream" into lmp-dev * commit 'e493afff2c5173fe934c1afaa9254938a7fa7590': Add audio_input_flags_t to HAL open_input_stream
| * | am d81d4896: Merge "Add audio_input_flags_t to HAL open_input_stream" into ↵Glenn Kasten2014-07-171-2/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | lmp-dev * commit 'd81d48961da30f657fb095ed00a697bd50266269': Add audio_input_flags_t to HAL open_input_stream
| | * Merge "Add audio_input_flags_t to HAL open_input_stream" into lmp-devGlenn Kasten2014-07-161-2/+3
| | |\
| | | * Add audio_input_flags_t to HAL open_input_streamGlenn Kasten2014-07-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For backward compatibility, until flags are added to openInput(), we will assume that the request is for a low latency input stream. Change-Id: I5e6f7e574418917ff1b41b0a47199203c69cb40f
* | | | am 2399ae9d: am 380d1e1a: am 2e25819f: Merge "M3UParser: check for NULL ↵Lajos Molnar2014-07-171-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | before setting meta data" * commit '2399ae9d9c215cdd1744aaa21ce9b821f103296a': M3UParser: check for NULL before setting meta data
| * | | am 380d1e1a: am 2e25819f: Merge "M3UParser: check for NULL before setting ↵Lajos Molnar2014-07-171-0/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | meta data" * commit '380d1e1abff2bbcba45d452e37f9699792422c08': M3UParser: check for NULL before setting meta data
| | * \ \ am 2e25819f: Merge "M3UParser: check for NULL before setting meta data"Lajos Molnar2014-07-171-0/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '2e25819fffbb23d42541ead1bf735f3a02fa0330': M3UParser: check for NULL before setting meta data
| | | * \ \ Merge "M3UParser: check for NULL before setting meta data"Lajos Molnar2014-07-161-0/+6
| | | |\ \ \
| | | | * | | M3UParser: check for NULL before setting meta dataRobert Shih2014-07-161-0/+6
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug:16351654 Change-Id: I64e9510f719b220471522b4d78a9b00a98bda772
* | | | | | am 856446eb: am 9b2ccd68: am f839b8b4: Merge "Fix M3UParser relative path ↵Lajos Molnar2014-07-170-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling." * commit '856446eba35ac246d29b055755cc49ad1f4d06b3': Fix M3UParser relative path handling.
| * | | | | am 9b2ccd68: am f839b8b4: Merge "Fix M3UParser relative path handling."Lajos Molnar2014-07-160-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '9b2ccd681c4624bb3a16fb6d80f16024528c8d22': Fix M3UParser relative path handling.
| | * | | | am f839b8b4: Merge "Fix M3UParser relative path handling."Lajos Molnar2014-07-161-1/+3
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'f839b8b435fbddca48ac2b65de397ea91c7260a3': Fix M3UParser relative path handling.
| | | * | | Merge "Fix M3UParser relative path handling."Lajos Molnar2014-07-161-1/+3
| | | |\ \ \
| | | | * | | Fix M3UParser relative path handling.Lajos Molnar2014-07-161-1/+3
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16017037 Change-Id: Ibfff99387fb5b3e721144a2b3f9174092d785137
* | | | | | am d323223d: am a8454c29: Fix M3UParser relative path handling.Lajos Molnar2014-07-161-1/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'd323223d210aa3dcb8691c9eea4622b66c18ea83': Fix M3UParser relative path handling.
| * | | | | am a8454c29: Fix M3UParser relative path handling.Lajos Molnar2014-07-161-1/+3
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit 'a8454c29b15748964b5eb556d1e23fbb1ee19ceb': Fix M3UParser relative path handling.
| | * | | | Fix M3UParser relative path handling.Lajos Molnar2014-07-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16017037 Change-Id: Ibfff99387fb5b3e721144a2b3f9174092d785137
* | | | | | am be0b73fb: am dcb162f3: sound trigger: added permission checksEric Laurent2014-07-162-9/+35
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'be0b73fb79b6152c73def8a9654f5c19ec159dbf': sound trigger: added permission checks
| * | | | | am dcb162f3: sound trigger: added permission checksEric Laurent2014-07-162-9/+35
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'dcb162f3aed807d1e51f29e2454ade584439992e': sound trigger: added permission checks
| | * | | | sound trigger: added permission checksEric Laurent2014-07-162-9/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add check for android.permission.CAPTURE_AUDIO_HOTWORD to all sound trigger binder calls on server side. Bug: 12378680. Change-Id: Ic3fd70e947882cdf5f4d4a4fe609a2c5a8236fd5
* | | | | | stagefright test: add surface playback flags -R,TDavid Smith2014-07-161-10/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -R renders video output to the surface ASAP -T renders video output to the surface using frame timestamps Change-Id: I232f19587036edc12e86b4f1dea4d12accef3834
* | | | | | am db14d359: am 671160ff: stagefright: add MediaCodec.reset()Lajos Molnar2014-07-162-0/+52
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'db14d35936bf88c0a0d55600f6ac25eb3624d08a': stagefright: add MediaCodec.reset()
| * | | | | am 671160ff: stagefright: add MediaCodec.reset()Lajos Molnar2014-07-162-0/+52
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '671160ffe81592efa376dc1ff0fc3f4ddcdebc35': stagefright: add MediaCodec.reset()
| | * | | | stagefright: add MediaCodec.reset()Lajos Molnar2014-07-152-0/+52
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Bug: 12034929 Change-Id: I326f1356df89474aa088c1c87f8505b33654139d
* | | | | am b2ea3336: am efebe397: Merge "const correctness on downmix and upmix" ↵Glenn Kasten2014-07-151-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'b2ea3336c125dbead022307afd66dacedeb3fbf2': const correctness on downmix and upmix
| * | | | am efebe397: Merge "const correctness on downmix and upmix" into lmp-devGlenn Kasten2014-07-151-3/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'efebe3974d4ad5870f957b77450c26a499fc467e': const correctness on downmix and upmix
| | * | | Merge "const correctness on downmix and upmix" into lmp-devGlenn Kasten2014-07-151-3/+3
| | |\ \ \
| | | * | | const correctness on downmix and upmixGlenn Kasten2014-07-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f51470a6d58a22310ce7cda80afc55e9d6df1dc
* | | | | | am bfe25249: am 7c5b60ae: audio policy: build with USE_LEGACY_AUDIO_POLICYEric Laurent2014-07-151-0/+13
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'bfe252496d77cce6a9e82bc9f92711ce42881faf': audio policy: build with USE_LEGACY_AUDIO_POLICY
| * | | | | am 7c5b60ae: audio policy: build with USE_LEGACY_AUDIO_POLICYEric Laurent2014-07-151-0/+13
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '7c5b60ae8b8793b2d601ecf459807c974120331b': audio policy: build with USE_LEGACY_AUDIO_POLICY
| | * | | | audio policy: build with USE_LEGACY_AUDIO_POLICYEric Laurent2014-07-151-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9def12ea689b00c0295c670c07373dacfb186799
* | | | | | am bf7b29f0: (-s ours) am 333f66d4: DO NOT MERGE LVM virtualizer: add ↵Jean-Michel Trivi2014-07-150-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support for virtualizer capability query * commit 'bf7b29f07b9dc939eeb94aafc97147c221df35d4': DO NOT MERGE LVM virtualizer: add support for virtualizer capability query
| * | | | | am 333f66d4: DO NOT MERGE LVM virtualizer: add support for virtualizer ↵Jean-Michel Trivi2014-07-152-36/+257
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | capability query * commit '333f66d4642ddd36b42668da2767551ba25f0248': DO NOT MERGE LVM virtualizer: add support for virtualizer capability query
| | * | | | DO NOT MERGE LVM virtualizer: add support for virtualizer capability queryJean-Michel Trivi2014-07-152-36/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I88106ba25f9b3f8fd7616307ab6b7fbe7afb6e91 (cherry picked from commit bfd3b9764841971be2d2f04a3fdbd41a2144beea)
* | | | | | Merge "Improve dumpsys for capture threads"Glenn Kasten2014-07-152-4/+6
|\ \ \ \ \ \
| * | | | | | Improve dumpsys for capture threadsGlenn Kasten2014-07-142-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If6a08a40d1eeba0690aa8da3c541f845ec101b7f
* | | | | | | Merge "Remove executable bit"Glenn Kasten2014-07-157-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove executable bitGlenn Kasten2014-07-147-0/+0
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I264a6f16a4650b1eac10f6777438ab4c1d0fc4c0
* | | | | | | LVM virtualizer: add support for virtualizer capability queryJean-Michel Trivi2014-07-152-36/+257
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Change-Id: I88106ba25f9b3f8fd7616307ab6b7fbe7afb6e91
* | | | | | am 5698d446: camera2: Set orientation flags for hardware composer.Ruben Brunk2014-07-144-84/+170
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit '5698d4461a260dbf208484383f692b03c6473e74': camera2: Set orientation flags for hardware composer.
| * | | | | camera2: Set orientation flags for hardware composer.Ruben Brunk2014-07-144-84/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15116722 Change-Id: I3fcc9aea38afcbd665f86c511a9929fe9a6a3a8f
* | | | | | am e580006c: Encoder input buffers don\'t need HW_TEXTURE usageJesse Hall2014-07-141-2/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'e580006cd0067109189975c56395d29309d49883': Encoder input buffers don't need HW_TEXTURE usage
| * | | | | Encoder input buffers don't need HW_TEXTURE usageJesse Hall2014-07-141-2/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ibb1be86ae99439ccbce3fc2b38d92115083ef7ff
* | | | | am 10fad6ad: am 787bdb33: Merge "Fix Externally reported security issue"Nick Kralevich2014-07-140-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '10fad6adce755808a21c02e1c4b94df7bf84e8b1': Fix Externally reported security issue
| * | | | am 787bdb33: Merge "Fix Externally reported security issue"Nick Kralevich2014-07-141-1/+12
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '787bdb33f6cdffd810dd243eedfbc0aed2c0abed': Fix Externally reported security issue
| | * | | Merge "Fix Externally reported security issue"Nick Kralevich2014-07-141-1/+12
| | |\ \ \
| | | * | | Fix Externally reported security issueJeff Tinker2014-07-111-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 12724697 Change-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13