summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | * | | | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-030-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0 * commit 'e0c9d8afd0886162f19d28eb33c82878a0dada7d': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | | * | | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-030-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea * commit 'db76a879ea1a2b57a1561b04c3ffb39bed3155ae': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | | | * | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-030-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours * commit '862b693ba3c2abaed66968385d3d7d4a3dd70cb3': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | | | | * | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-030-0/+0
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 * commit '4c0d24362609e9aa9f4f6afe6ee483d3d939f663': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | | | | | * | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-030-0/+0
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | |/ / / | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours * commit '9e1d7751b12ea976323abc1fe7760323ab142d39': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | | | | | | * | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-032-1/+18
| | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | |/ / | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 * commit '6afc659b00c3f4a83b9f5f3c744b7119b33340b4': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | | | | | | | * | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-032-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. Bug: 25812794 Change-Id: I96dc74734380d462583f6efa33d09946f9532809 (cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)
| | | * | | | | | | | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 am: b7e63bfadb am: 2c7411483b * commit '2c7411483b098a84de41f56c2bce6ff8518ff7a2': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | * | | | | | | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-030-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 am: b7e63bfadb * commit 'b7e63bfadbd83396f68e7b99ee3b6e67f646bf58': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | * | | | | | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-030-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 * commit 'e3bbe235f618af53774758727c2c22d02aead97b': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | * | | | | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-030-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours * commit 'dd4576b0177a26d7f52a48b18405f49d6ef1b5fb': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | * | | | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-030-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 * commit 'bed81d6594f26cb86c542d61fa65130f3f898b1b': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | | * | | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-030-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 * commit 'e4223a8d324e03aec1130b166bf19367bd490b8f': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | | | * | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-030-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours * commit '3e8e1345971927e0aa5e55c34f79f6856101a96b': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | | | | * | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-032-0/+18
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 * commit '0462975291796e414891e04bcec9da993914e458': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | | | | | * | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-032-0/+18
| | | | | | | | | | | | |_|/ / | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. Bug: 25812794 Change-Id: I96dc74734380d462583f6efa33d09946f9532809 (cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)
| | | * | | | | | | | | | | | libstagefright: check requested memory size before allocation for ↵Wei Jia2015-12-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225 am: bee48d7956 am: d1bcd1a80f * commit 'd1bcd1a80f1b12a3c18616bca48e7afc2fff52b6': libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | * | | | | | | | | | | libstagefright: check requested memory size before allocation for ↵Wei Jia2015-12-030-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225 am: bee48d7956 * commit 'bee48d795693f4794f807b964aa96712cbd1b6b0': libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | * | | | | | | | | | libstagefright: check requested memory size before allocation for ↵Wei Jia2015-12-030-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225 * commit '69bd1cf225328e64a5b4ae6935d2b7fe0b7b6400': libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | * | | | | | | | | libstagefright: check requested memory size before allocation for ↵Wei Jia2015-12-032-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftMPEG4Encoder and SoftVPXEncoder. Bug: 25812794 Change-Id: I96dc74734380d462583f6efa33d09946f9532809 (cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)
| | | * | | | | | | | | | | | libstagefright: check requested memory size before allocation for ↵Wei Jia2015-12-032-0/+18
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftMPEG4Encoder and SoftVPXEncoder. am: 87f8cbb223 am: a022f6e7b7 * commit 'a022f6e7b7f3ef86095199ef02903051c9a6a08c': libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | * | | | | | | | | | | libstagefright: check requested memory size before allocation for ↵Wei Jia2015-12-032-0/+18
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftMPEG4Encoder and SoftVPXEncoder. am: 87f8cbb223 * commit '87f8cbb223ee516803dbb99699320c2484cbf3ba': libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | * | | | | | | | | | libstagefright: check requested memory size before allocation for ↵Wei Jia2015-11-202-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftMPEG4Encoder and SoftVPXEncoder. Bug: 25812794 Change-Id: I96dc74734380d462583f6efa33d09946f9532809
| | | * | | | | | | | | | | | DO NOT MERGE Revert "AwesomePlayer: Separate cache buffer watermarks for ↵Chris Elliott2015-12-021-27/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offload audio" This reverts commit ddbebb92f831784dc143d2cd8492ce690e238744.
| | | * | | | | | | | | | | | DO NOT MERGE Revert "AwesomePlayer: Stop posting buffering events once at EOS"Chris Elliott2015-12-021-2/+1
| | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 701cac1716d5ddb867a5444ea152d26741f3b397.
| | | * | | | | | | | | | | AwesomePlayer: Separate cache buffer watermarks for offload audioSridhar Vashist2015-11-231-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Using normal playback cache watermarks for offload playback leads to cache underruns & buffering pauses resulting in choppy audio. - Add new properties to define cache hi/low watermarks for offload audio. - Calculate cache buffer levels only based on size for offload audio. Change-Id: Idb8c1be351678d57490939187079f452a65aebc3 Signed-off-by: Sridhar Vashist <svashist@motorola.com>
| | | * | | | | | | | | | | AwesomePlayer: Stop posting buffering events once at EOSSridhar Vashist2015-11-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop posting buffering events once at end of stream to avoid perpetually holding the 'TimedEventQueue' wakelock in libstagefright. Change-Id: I3b8012886f2c27e830ce215b14090c35825635cd Signed-off-by: Sridhar Vashist <svashist@motorola.com>
| | | * | | | | | | | | | | Merge "DO NOT MERGE - IAudioFlinger: add checks on binder calls" into ↵Sam Lin2015-11-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cw-d-mr1-dev am: 2b587abb1b -s ours * commit '2b587abb1ba4a3492a97f1505701c0aeeb08a386': DO NOT MERGE - IAudioFlinger: add checks on binder calls
| | | | * \ \ \ \ \ \ \ \ \ \ Merge "DO NOT MERGE - IAudioFlinger: add checks on binder calls" into ↵Sam Lin2015-11-021-10/+36
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cw-d-mr1-dev
| | | | | * | | | | | | | | | | DO NOT MERGE - IAudioFlinger: add checks on binder callsEric Laurent2015-10-151-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit number of ports and patches listed by LIST_AUDIO_PATCHES and LIST_AUDIO_PORTS. Also fix typo causing wring pointer to be used when writing to Parcel. Bug: 19573085. Change-Id: I41a9c710e45738a4f11990160587856c429a4646 (cherry picked from commit 9ef830c6dbd4f6000b94abee3df14b9e27a38294)
| | | * | | | | | | | | | | | | DO NOT MERGE - audio flinger: fix fuzz test crashEric Laurent2015-11-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e4b4cf1b6d -s ours * commit 'e4b4cf1b6d8f99da91f287837185b27f919050a1': DO NOT MERGE - audio flinger: fix fuzz test crash
| | | | * | | | | | | | | | | | DO NOT MERGE - audio flinger: fix fuzz test crashEric Laurent2015-10-153-7/+22
| | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear output stream pointer in duplicating thread when the main output to which it is attached is closed. Also do not forward master mute and volume commands to duplicating threads as this is not applicable. Also fix logic in AudioFlinger::primaryPlaybackThread_l() that could accidentally return a duplicating thread. This never happens because the primary thread is always first in the list. Bug: 20731946. Change-Id: Ic8869699836920351b23d09544c50a258d3fb585 (cherry picked from commit f6870aefc5e31d4220f3778c4e79ff34a61f48ad)
| | | * | | | | | | | | | | | Merge "Reduce lock time for dump to make sure not locked when calling back ↵Ronghua Wu2015-11-021-11/+26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to IResourceManagerClient." into mnc-dr-dev am: 83a22c5c81 * commit '83a22c5c818ebf4f9c80a2dd3fee49258e0c33a6': Reduce lock time for dump to make sure not locked when calling back to IResourceManagerClient.
| | | | * | | | | | | | | | | Merge "Reduce lock time for dump to make sure not locked when calling back ↵Ronghua Wu2015-11-021-11/+26
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to IResourceManagerClient." into mnc-dr-dev
| | | | | * | | | | | | | | | | Reduce lock time for dump to make sure not locked when calling back to ↵Ronghua Wu2015-10-261-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IResourceManagerClient. Bug: 25166048 Change-Id: I35f9917079c4b783a7cf4cef94b3c7112760c0b8
| | | * | | | | | | | | | | | | fix deadlock in MediaPlayerServiceErik Wolsheimer2015-10-301-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 25263909 Change-Id: I3f08c02a851b67ab269e9aef7b2fb17eda09ea5d
| | | * | | | | | | | | | | | | Merge "ALooper::awaitResponse gets reply and returns immediately if the ↵Ronghua Wu2015-10-301-16/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | looper is stopped." into mnc-dr-dev am: 1d29e126cf * commit '1d29e126cf152d3400021a2edd5cee123077317e': ALooper::awaitResponse gets reply and returns immediately if the looper is stopped.
| | | | * | | | | | | | | | | | Merge "ALooper::awaitResponse gets reply and returns immediately if the ↵Ronghua Wu2015-10-301-16/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | looper is stopped." into mnc-dr-dev
| | | | | * | | | | | | | | | | | ALooper::awaitResponse gets reply and returns immediately if the looper is ↵Ronghua Wu2015-10-261-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stopped. Bug: 25088488 Change-Id: Id33d5d75f1173db52d00f4ff71d4c2c4f27f72f5
| | | * | | | | | | | | | | | | | Merge "Revert "Revert "audio policy: bind setMode() and setPhoneState() ↵Zach Jang2015-10-271-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operations""" into mnc-dev am: 681bc45d25 am: f6224dece5 * commit 'f6224dece52c569e27322580407c3f5898fa042b': Revert "Revert "audio policy: bind setMode() and setPhoneState() operations""
| | | | * | | | | | | | | | | | | Merge "Revert "Revert "audio policy: bind setMode() and setPhoneState() ↵Zach Jang2015-10-271-1/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operations""" into mnc-dev am: 681bc45d25 * commit '681bc45d2592ed447f70d1dd14e92ad584499c9d': Revert "Revert "audio policy: bind setMode() and setPhoneState() operations""
| | | | | * | | | | | | | | | | | Merge "Revert "Revert "audio policy: bind setMode() and setPhoneState() ↵Zach Jang2015-10-271-1/+5
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operations""" into mnc-dev
| | | | | | * | | | | | | | | | | | Revert "Revert "audio policy: bind setMode() and setPhoneState() operations""Zach Jang2015-10-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 26ce11a1dd2a9b70865aec1b42c365dd19172511. Change-Id: I0affb97e7f2eb541ebd6f26c33e8f32261e9e221
| | | * | | | | | | | | | | | | | | Merge "Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""" ↵Zach Jang2015-10-271-8/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev am: 6919fbe40d am: 8c5b71ce47 * commit '8c5b71ce473517ea1270f6467fa518274bd54b35': Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""
| | | | * | | | | | | | | | | | | | Merge "Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""" ↵Zach Jang2015-10-271-8/+16
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev am: 6919fbe40d * commit '6919fbe40d92af432d3b72ad36e0697654f8146c': Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""
| | | | | * | | | | | | | | | | | | Merge "Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""" ↵Zach Jang2015-10-271-8/+16
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| | | | | | * | | | | | | | | | | | | Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""Zach Jang2015-10-271-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 75c82b50951b21190f710a638c6a26ff7ee6d86d. Change-Id: I1b1f147bedf205636ec20b84faf6ef597a781c0d
| | | * | | | | | | | | | | | | | | | Merge "Revert "AudioPolicyService: fix race in AudioCommandThread"" into ↵Zach Jang2015-10-271-16/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev am: cda4871486 am: 1fcbd9b0e9 * commit '1fcbd9b0e973d662ed566967af71c8f5b2383320': Revert "AudioPolicyService: fix race in AudioCommandThread"
| | | | * | | | | | | | | | | | | | | Merge "Revert "AudioPolicyService: fix race in AudioCommandThread"" into mnc-devZach Jang2015-10-271-16/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cda4871486 * commit 'cda487148602325701ffd7f595ca096a182f380c': Revert "AudioPolicyService: fix race in AudioCommandThread"
| | | | | * | | | | | | | | | | | | | Merge "Revert "AudioPolicyService: fix race in AudioCommandThread"" into mnc-devZach Jang2015-10-271-16/+8
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / /