summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* am d7986933: am 0cbeaf83: am 8cffa91a: Merge "audio policy: suppport for ↵Eric Laurent2014-12-122-48/+101
|\ | | | | | | | | | | | | dynamic source" into lmp-mr1-dev * commit 'd7986933bcf0b327bc260312b0ff0f83431a158b': audio policy: suppport for dynamic source
| * am 0cbeaf83: am 8cffa91a: Merge "audio policy: suppport for dynamic source" ↵Eric Laurent2014-12-122-48/+101
| |\ | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '0cbeaf83f7f50b5bc25a8dd7a08ea4e7c364c815': audio policy: suppport for dynamic source
| | * Merge "audio policy: suppport for dynamic source" into lmp-mr1-devEric Laurent2014-12-112-48/+101
| | |\
| | | * audio policy: suppport for dynamic sourceEric Laurent2014-12-102-48/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completed support for dynamic sources: - remote submix input device is dynamically connected/disconnected when corresponding AudioTrack starts/stops. Also do not create a duplicated output for mixes used by dynamic policies. Bug: 16006090. Change-Id: Ib5b5a2159fcac9d9f410a5a2f1c64d7ebad79f72
* | | | am 7b2b2675: am 67c93ad7: am f1b12df3: Merge "Trigger error only when a ↵Chih-Hung Hsieh2014-12-121-6/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | template is instantiated." * commit '7b2b26750fb0a567f2d1b7a3547ae877d336e405': Trigger error only when a template is instantiated.
| * | | am 67c93ad7: am f1b12df3: Merge "Trigger error only when a template is ↵Chih-Hung Hsieh2014-12-121-6/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instantiated." * commit '67c93ad704d4418445c6d9693420f1cbaad98b0a': Trigger error only when a template is instantiated.
| | * | | Trigger error only when a template is instantiated.Chih-Hung Hsieh2014-12-111-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang compiler will check defintions and trigger undefined template error of 'android::CompileTimeAssert<false>' even when MixMul is not instantiated. Avoid such parse time error but trigger link error when the generic MixMul template is used. Change-Id: I84ef60a69fbfbeefc93b5654e4bdd54f9d530867
* | | | | am 2592184c: am 6baa8fe7: am 94a92c69: Merge "[audio][audioflinger] Consume ↵Phil Burk2014-12-111-2/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | all frames when a DirectThread is done." into lmp-mr1-dev * commit '2592184c976ef83aa9fdad7d63bfdb408c95aa7d': [audio][audioflinger] Consume all frames when a DirectThread is done.
| * | | | am 6baa8fe7: am 94a92c69: Merge "[audio][audioflinger] Consume all frames ↵Phil Burk2014-12-111-2/+7
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | when a DirectThread is done." into lmp-mr1-dev * commit '6baa8fe747621b7121ff18dcdfab15d99c349c15': [audio][audioflinger] Consume all frames when a DirectThread is done.
| | * | | Merge "[audio][audioflinger] Consume all frames when a DirectThread is ↵Phil Burk2014-12-111-2/+7
| | |\ \ \ | | | |_|/ | | |/| | | | | | | done." into lmp-mr1-dev
| | | * | [audio][audioflinger] Consume all frames when a DirectThread is done.Phil Burk2014-12-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was causing movies to think there was still data left to play so they never finished. Bug: 18360054 Change-Id: If7aee81d62b7af8532abd14579677848a06fe2b1 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | am bd9df749: am 1546028a: am 1767df77: AudioPolicyManager: distinguish ↵Jean-Michel Trivi2014-12-102-2/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | between mirroring and rerouting * commit 'bd9df749bf5875fb2a1d909b0da920b8f261a419': AudioPolicyManager: distinguish between mirroring and rerouting
| * | | | am 1546028a: am 1767df77: AudioPolicyManager: distinguish between mirroring ↵Jean-Michel Trivi2014-12-102-2/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | and rerouting * commit '1546028a2d02837f88f7ea1a4109e7649b665d2f': AudioPolicyManager: distinguish between mirroring and rerouting
| | * | | AudioPolicyManager: distinguish between mirroring and reroutingJean-Michel Trivi2014-12-092-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the screen mirroring case, the notification manager queries the policy to see if media "is playing remotely": if yes, it will not request audio focus before playing a notification. This is the correct behavior for screen mirroring, but doesn't work when audio is rerouted to an external policy. This change consists in not reporting "remote" activity when playing to a mix of an external policy by looking at the address of the output on which playback is active for the given stream type. Bug 16009464 Change-Id: Iebbf5a8c738ab36c1cf2055e921c0a3472503125
* | | | | am 66b17e9d: Merge commit \'f5a968a0\' into mmGlenn Kasten2014-12-104-1/+30
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '66b17e9dfe114ae968bfb2f8ad8325527e373c65': audio policy: binder calls for dynamic audio policy mixes
| * | | | Merge commit 'f5a968a0' into mmGlenn Kasten2014-12-104-1/+30
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: Ifd30546c11def40ad483f27c9d7baa4008fcbac3
| | * | | Merge "audio policy: binder calls for dynamic audio policy mixes" into ↵Eric Laurent2014-12-104-1/+30
| | |\ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | audio policy: binder calls for dynamic audio policy mixesEric Laurent2014-12-094-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add binder calls to register and unregister dynamic mixes to AudioPolicyManager. Bug: 16009464. Change-Id: I4ef38166d0cfc88c984970969380d0cd6eb083ac
* | | | | | am b279f5ad: am c49d9cda: am 2dda40d6: Merge "audio policy: add support for ↵Eric Laurent2014-12-103-104/+440
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | custom mixes" into lmp-mr1-dev * commit 'b279f5adfa2fd6f22c87b3a7106fbb62a0b9a5d2': audio policy: add support for custom mixes
| * | | | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ↵Eric Laurent2014-12-103-104/+440
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'c49d9cda49dab8b7dd0376cf56476b3e1895d5c6': audio policy: add support for custom mixes
| | * | | | Merge "audio policy: add support for custom mixes" into lmp-mr1-devEric Laurent2014-12-103-104/+440
| | |\ \ \ \ | | | |/ / /
| | | * | | audio policy: add support for custom mixesEric Laurent2014-12-093-104/+440
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for custom mixes in AudioPolicyManager. Two methods are added to register or unregister a list of custom mixes with their attributes and format. getOutputForAttr() and getInputForAttr() first look for a match in registered mixes before defaulting to normal output/input selection Remote submix device connection disconnection now takes address into account to identify the correspnoding custom mix. Bug: 16009464. Change-Id: I3f1c2a485a0fb71b1f984ed0adc9b68aa971e408
* | | | | | am f44bdeb7: am 61697a5c: am 9cea7aa4: Merge "Camera3Device: support shutter ↵Chien-Yu Chen2014-12-102-141/+234
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after result" into lmp-mr1-dev * commit 'f44bdeb7aff53309ed09fdbf48be526c58f7964b': Camera3Device: support shutter after result
| * | | | | am 61697a5c: am 9cea7aa4: Merge "Camera3Device: support shutter after ↵Chien-Yu Chen2014-12-102-141/+234
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | result" into lmp-mr1-dev * commit '61697a5c1ddd2ad882a889474822851187734cf4': Camera3Device: support shutter after result
| | * | | | Merge "Camera3Device: support shutter after result" into lmp-mr1-devChien-Yu Chen2014-12-092-141/+234
| | |\ \ \ \
| | | * | | | Camera3Device: support shutter after resultChien-Yu Chen2014-12-092-141/+234
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the code to remove in-flight requests from processCaptureResult to a separate function so it can be called when the framework receives a result or a shutter event. An in-flight request will only be removed when both results and the shutter event arrive in the case of a successful request. Also send out results only after the shutter event receives. Bug: 18135776 Change-Id: I340db1a495c711b0913784d43fd0f144871e4420
* | | | | | am 3b46819e: Merge commit \'2340e5a8\' into manualmergeRuben Brunk2014-12-102-4/+81
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '3b46819eb0dd9ea510619c351d7ffdc244ed511d': Camera2: Round unsupported surface sizes in configure.
| * | | | | Merge commit '2340e5a8' into manualmergeRuben Brunk2014-12-092-4/+81
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: I0299d49b7e283072fc646de717fd7c1643241984
| | * | | | Merge "Camera2: Round unsupported surface sizes in configure." into lmp-mr1-devRuben Brunk2014-12-092-4/+81
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Camera2: Round unsupported surface sizes in configure.Ruben Brunk2014-12-052-4/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16030677 Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
* | | | | | am b156888d: am 427aca5b: am 18265202: Merge "audio policy: fix inifinite ↵Eric Laurent2014-12-091-5/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loop in clearAudioPatches()" into lmp-mr1-dev * commit 'b156888dcd2f8b3b05d724a31ec1c48da322fdc1': audio policy: fix inifinite loop in clearAudioPatches()
| * | | | | am 427aca5b: am 18265202: Merge "audio policy: fix inifinite loop in ↵Eric Laurent2014-12-081-5/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clearAudioPatches()" into lmp-mr1-dev * commit '427aca5bebaacfd5639b85661689ebd554bd0822': audio policy: fix inifinite loop in clearAudioPatches()
| | * | | | Merge "audio policy: fix inifinite loop in clearAudioPatches()" into lmp-mr1-devEric Laurent2014-12-061-5/+2
| | |\ \ \ \
| | | * | | | audio policy: fix inifinite loop in clearAudioPatches()Eric Laurent2014-12-051-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | releaseAudioPatch() does not necessarily remove the audio patch from the list. Scan the list from the top down to avoid adjusting the index. Bug: 18621514. Change-Id: I58787154680f7cb1818509017835b1693d62190f
* | | | | | | am c12caed1: am a9450bbc: am cbbe1ccc: Merge "audio policy: fix AudioPort ↵Eric Laurent2014-12-091-0/+20
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameter checks" into lmp-mr1-dev * commit 'c12caed177ec2d4912394be692854dc1d632b3c3': audio policy: fix AudioPort parameter checks
| * | | | | | am a9450bbc: am cbbe1ccc: Merge "audio policy: fix AudioPort parameter ↵Eric Laurent2014-12-081-0/+20
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checks" into lmp-mr1-dev * commit 'a9450bbc6274451bbb4241595d74d6ce9a4160d1': audio policy: fix AudioPort parameter checks
| | * | | | | Merge "audio policy: fix AudioPort parameter checks" into lmp-mr1-devEric Laurent2014-12-051-0/+20
| | |\ \ \ \ \
| | | * | | | | audio policy: fix AudioPort parameter checksEric Laurent2014-12-041-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept any value for sampling rate, format or channel mask if the list of supported values is empty in the AudioPort. Bug: 18575607. Change-Id: I93e1942b89c630e3fee490799a8f8d79f7831ab7
* | | | | | | | am f3376bdb: am 668b0550: am 597ce69a: Merge "Camera: Add support for ↵Eino-Ville Talvala2014-12-091-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCENE_MODE_HDR for newer HALs" into lmp-mr1-dev * commit 'f3376bdbcb48daad6889d28ee2c98b174f12028e': Camera: Add support for SCENE_MODE_HDR for newer HALs
| * | | | | | | am 668b0550: am 597ce69a: Merge "Camera: Add support for SCENE_MODE_HDR for ↵Eino-Ville Talvala2014-12-081-0/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | newer HALs" into lmp-mr1-dev * commit '668b055081bb9d0d61775acf67bb27ce66b214f6': Camera: Add support for SCENE_MODE_HDR for newer HALs
| | * | | | | | Merge "Camera: Add support for SCENE_MODE_HDR for newer HALs" into lmp-mr1-devEino-Ville Talvala2014-12-051-0/+6
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Camera: Add support for SCENE_MODE_HDR for newer HALsEino-Ville Talvala2014-12-051-0/+6
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Bug: 18640480 Change-Id: I7b772d10b2bd136c78395fd2816114b27bb48d00
* | | | | | | am e9011c22: am 07e19019: am 9257000c: camera: fix logging in ZslProcessor ↵Ruchit Sharma2014-12-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to avoid spam * commit 'e9011c22e000cc0c1e8080b687893fbbe3c17278': camera: fix logging in ZslProcessor to avoid spam
| * | | | | | am 07e19019: am 9257000c: camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-081-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '07e190190ffddfbc32ecbf0bd9a9679817da232b': camera: fix logging in ZslProcessor to avoid spam
| | * | | | | camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-051-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AF state mismatch while selecting ZSL candidate should not be treated as a warning. This results into undesriable spam in the logs. ALso, using ALOGVV is consistent with how AE state mismatch is handled in ZslProcessor3.cpp Bug: 18634318 Change-Id: Ia9d7f2bb98f784990b1a6f923983c35f622c3791
* | | | | | am 900f6535: am 561f50de: am db995fe3: Merge "Fix getTimestamp if offload ↵Andy Hung2014-12-091-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread is not initialized." into lmp-mr1-dev * commit '900f6535af232298e4a77477907a40f68e8dc61b': Fix getTimestamp if offload thread is not initialized.
| * | | | | am 561f50de: am db995fe3: Merge "Fix getTimestamp if offload thread is not ↵Andy Hung2014-12-081-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialized." into lmp-mr1-dev * commit '561f50de82ce47f11ba8d4f25db1ca1d8467b2a7': Fix getTimestamp if offload thread is not initialized.
| | * | | | Merge "Fix getTimestamp if offload thread is not initialized." into lmp-mr1-devAndy Hung2014-12-051-1/+2
| | |\ \ \ \
| | | * | | | Fix getTimestamp if offload thread is not initialized.Andy Hung2014-12-031-1/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns INVALID_OPERATION. Bug: 18605649 Change-Id: I440fb687fbf9249098e049982fa83bcd1515fd80
* | | | | | am 9f104ea6: am 94d91778: am 18f2f90c: [FM] Fix Buganizer ID: 18456930 - FM ↵Hochi Huang2014-12-051-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | radio audio got routed to loudspeaker unexpectedly * commit '9f104ea6d1123199f1f2e88934fae939c112a9b3': [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker unexpectedly
generated by cgit v1.1 at 2024-05-11 20:52:36 +0000