summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* am 0fd52ac2: am 6eac9e2f: Merge "Camera2Client: flush requests in ↵Chien-Yu Chen2014-12-161-0/+9
|\ | | | | | | | | | | | | stopPreviewL" into lmp-mr1-dev * commit '0fd52ac2929f6ded984cc3a063645d65b5e2006f': Camera2Client: flush requests in stopPreviewL
| * Camera2Client: flush requests in stopPreviewLRuchit Sharma2014-12-151-0/+9
| | | | | | | | | | | | | | | | | | Requests queued in the pipeline have little meaning after the app calls stopPreview(). Flushing will help improve the switch KPI. bug 17340914 Change-Id: I899d69aa3b0fd41f028760290a81013297712fed
* | am 23085662: am c73ca6ef: audio policy: fix remote mic captureEric Laurent2014-12-132-17/+43
|\ \ | |/ | | | | | | * commit '2308566236a3ff16197419ec226f956a295fe81a': audio policy: fix remote mic capture
| * audio policy: fix remote mic captureEric Laurent2014-12-122-17/+43
| | | | | | | | | | | | | | | | | | | | | | | | commit 275e8e9de introduced a regression for platforms overriding AudioPolicyManager::getDeviceForInputSource() method. Fixed by defining specific non virtual methods when overiding would break remote submix implementation. Bug: 18736417. Change-Id: Id4d0a6c48da987e6fb24422f2d61c7ab0fbfc921
* | 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 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 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 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
* | | | 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 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 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
* | | | | 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 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 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 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 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 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 94d91778: am 18f2f90c: [FM] Fix Buganizer ID: 18456930 - FM radio audio ↵Hochi Huang2014-12-051-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | got routed to loudspeaker unexpectedly * commit '94d9177849bb68434d3839a9b0886e09489de7f2': [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker unexpectedly
| * | | | [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker ↵Hochi Huang2014-12-041-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unexpectedly https://partner-android-review.git.corp.google.com/#/c/187894/ Change-Id: I3f9175bbc302e382155e568e66b88400ec05ffa5 Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
* | | | am eb05bacc: am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true ↵Elliott Hughes2014-12-031-4/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | for __arm__." * commit 'eb05baccea81f125d042be33c36dcf1893d903d9': __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.
| * | | __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.Elliott Hughes2014-12-021-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And this is the only user of that macro... Bug: 18556103 Change-Id: I1b515a54ac8530b150f4dd93070db60c701a5603
* | | | am 390ef843: am f20c4356: Merge "AudioRecord: use audio attributes instead ↵Eric Laurent2014-11-276-94/+99
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | of audio source." into lmp-mr1-dev * commit '390ef84373b7edd1397381f780ca235326357094': AudioRecord: use audio attributes instead of audio source.
| * | | AudioRecord: use audio attributes instead of audio source.Eric Laurent2014-11-256-94/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added AudioRecord constructor with audio attributes. Replaced AudioPolicymanager::getInput() by getInputForAttr(). No new functionality for now. Also: - Fixed warnings in AudioPolicyManager - Allocate audio session ID before calling getOutputForAttr() in AudioTrack. Bug: 16006090. Change-Id: I15df21e4411db688e3096dd801cf579d76d81711
* | | | am 5bf757cf: am 087eb332: Merge "audio policy: do not route accessibility ↵Eric Laurent2014-11-261-0/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | prompts to compressed output" into lmp-mr1-dev * commit '5bf757cfb8b43e5d92be95a8c700e4b7839f6730': audio policy: do not route accessibility prompts to compressed output
| * | | Merge "audio policy: do not route accessibility prompts to compressed ↵Eric Laurent2014-11-261-0/+15
| |\ \ \ | | | | | | | | | | | | | | | output" into lmp-mr1-dev
| | * | | audio policy: do not route accessibility prompts to compressed outputEric Laurent2014-11-251-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a digital output (HDMI or S/PDIF) is configured with a non linear PCM audio format it is likely that the audio HAL or HW will not be able to mix other sounds with the main media stream being played. In this case, do not condider HDMI or S/PDIF as a valid route for accessibilty strategy so that accessibility prompts are always audible. Bug: 18067208. Change-Id: If20603a1dc1dc470f206f841308bed2b87daf21c
* | | | | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() ↵Eric Laurent2014-11-269-97/+222
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | prototype." into lmp-mr1-dev * commit 'bf14c62e7973ed793a3b00c2c67beca4484c1c7a': audio policy: new getOutputForAttr() prototype.