summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Line length 100Glenn Kasten2014-12-306-9/+16
| | | | Change-Id: I6c8fe626a3825fa9e139319656d682a57b887c97
* am b915a420: am 57221635: am 5886252a: Merge "audio policy: fix ↵Eric Laurent2014-12-241-5/+16
|\ | | | | | | | | | | | | isSourceActive() for hotword" into lmp-mr1-dev * commit 'b915a420a6a205d30c0181d3fc13078fc6d37a3c': audio policy: fix isSourceActive() for hotword
| * am 57221635: am 5886252a: Merge "audio policy: fix isSourceActive() for ↵Eric Laurent2014-12-241-5/+16
| |\ | | | | | | | | | | | | | | | | | | hotword" into lmp-mr1-dev * commit '572216352498c702651567b3b299a1f7ed725429': audio policy: fix isSourceActive() for hotword
| | * audio policy: fix isSourceActive() for hotwordEric Laurent2014-12-191-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only condider AUDIO_SOURCE_HOTWORD equivalent to AUDIO_SOURCE_VOICE_RECOGNITION if the active capture was triggered by a hardware hotword recognition. Also fix activeInputsCount(). Bug: 18802896. Change-Id: I471aafcae29a76e9c323c6c0c314ef083991476b
* | | am d8be13b8: am caf17e31: am 0a0662ea: Merge "audio policy: improve ↵Eric Laurent2014-12-201-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | accessibility routing" into lmp-mr1-dev * commit 'd8be13b8d964b7edb02cb2ad64dee86ff247c911': audio policy: improve accessibility routing
| * | am caf17e31: am 0a0662ea: Merge "audio policy: improve accessibility ↵Eric Laurent2014-12-201-0/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | routing" into lmp-mr1-dev * commit 'caf17e316c7b7c22e877397f6bb3f882e4f68279': audio policy: improve accessibility routing
| | * audio policy: improve accessibility routingEric Laurent2014-12-191-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Force re-evaluating accessibility use case routing when a condition affecting it (ringtone, alarm, call state) is changing. Bug: 18761698. Change-Id: I42ac3a9fdc80bce11cf0a7fc76f680af4271abc9
* | | am 85aca658: am d33712d7: am 145cf5d8: Merge "audioflinger: implement ↵Eric Laurent2014-12-173-30/+115
|\ \ \ | |/ / | | | | | | | | | | | | | | | pause/resume for direct outputs" into lmp-mr1-dev * commit '85aca658ac7d20584b0647427256df50a5f243ef': audioflinger: implement pause/resume for direct outputs
| * | am d33712d7: am 145cf5d8: Merge "audioflinger: implement pause/resume for ↵Eric Laurent2014-12-173-30/+115
| |\ \ | | |/ | | | | | | | | | | | | | | | direct outputs" into lmp-mr1-dev * commit 'd33712d7ec5dcf427cc0be9b7d2ca1c99823c8e6': audioflinger: implement pause/resume for direct outputs
| | * Merge "audioflinger: implement pause/resume for direct outputs" into lmp-mr1-devEric Laurent2014-12-173-30/+115
| | |\
| | | * audioflinger: implement pause/resume for direct outputsEric Laurent2014-12-163-30/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend pause/resume support to direct output threads (was only for offload threads). If the HAL implements pause/resume, track pause/resume is forwarded to the HAL. Pause, flush, resume sequence is respected by executing the HAL calls in the playback thread (same as offload). Make sure the track flags on client side are consistent with the flags on server side. Bug: 17883772. Change-Id: I89b360d69818f7a9204bd36e3ec63a79e106ecf1
* | | | am 22dfb932: am 8aadc515: am 71b52b5b: Merge "Fix routing not happening ↵Jean-Michel Trivi2014-12-171-0/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | after change in output device list" into lmp-mr1-dev * commit '22dfb93254de370d401706728aba1f032ef1b172': Fix routing not happening after change in output device list
| * | | am 8aadc515: am 71b52b5b: Merge "Fix routing not happening after change in ↵Jean-Michel Trivi2014-12-171-0/+18
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | output device list" into lmp-mr1-dev * commit '8aadc515b57c78cbb07ae7d0cb2553148ef05947': Fix routing not happening after change in output device list
| | * | Merge "Fix routing not happening after change in output device list" into ↵Jean-Michel Trivi2014-12-171-0/+18
| | |\ \ | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | Fix routing not happening after change in output device listJean-Michel Trivi2014-12-161-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an output stream is active while rerouting rules are installed and recording starts, the list of outputs is not updated and therefore the stream is not rerouted to the new virtual device. The fix consists in also taking into account all the policy-related outputs when evaluating the before and after list of outputs following a connection state event. Bug 18736417 Change-Id: I6697976b3f89e2c0995e888e9046a2273361bb97
* | | | | am 93118cd9: am 99429b40: am 277c7b8c: Merge "Fix permission check for audio ↵Jean-Michel Trivi2014-12-176-14/+74
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | recording" into lmp-mr1-dev * commit '93118cd96233b682be95a3eb114d88d69c8cc416': Fix permission check for audio recording
| * | | | am 99429b40: am 277c7b8c: Merge "Fix permission check for audio recording" ↵Jean-Michel Trivi2014-12-176-14/+74
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '99429b40411790b85e19c57392bbd292a237c470': Fix permission check for audio recording
| | * | | Merge "Fix permission check for audio recording" into lmp-mr1-devJean-Michel Trivi2014-12-176-14/+74
| | |\ \ \ | | | |/ /
| | | * | Fix permission check for audio recordingJean-Michel Trivi2014-12-156-14/+74
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define input types covering the different usecases for audio recording, and check the corresponding permissions when starting to record. Move the permission check from audio flinger to audio policy, as only the policy has the information to determine which permission to enforce. Fix missing permission when an application records audio and the audio is injected by an external policy. Bug 18736417 Change-Id: If7ec040502242c990ac8ea464db484339bdce573
* | | | am 3af7b729: am 7ca332ab: am 045e710f: [FM] Fix notification routing when FM ↵Hochi Huang2014-12-171-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | enable * commit '3af7b7291bcd9b1b30dd11a8bedbdc63cc74b5a9': [FM] Fix notification routing when FM enable
| * | | am 7ca332ab: am 045e710f: [FM] Fix notification routing when FM enableHochi Huang2014-12-171-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '7ca332ab8d7329598386acc1f50c43fc59952210': [FM] Fix notification routing when FM enable
| | * | [FM] Fix notification routing when FM enableHochi Huang2014-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://partner-android-review.git.corp.google.com/#/c/188454/ Bug: 18727227 Change-Id: I74856ede5999cfc8a6932a99855d468cccd6f51c Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
* | | | am 70043ec5: am 679a1439: am be845fce: Merge "audiopolicy : Fix for ↵Eric Laurent2014-12-161-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | incorrect input device selection" into lmp-mr1-dev * commit '70043ec5e8c79803972686577a9d36431019c15f': audiopolicy : Fix for incorrect input device selection
| * | | am 679a1439: am be845fce: Merge "audiopolicy : Fix for incorrect input ↵Eric Laurent2014-12-161-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | device selection" into lmp-mr1-dev * commit '679a14393639c70a653fe2a07f8de582d3a5de14': audiopolicy : Fix for incorrect input device selection
| | * | Merge "audiopolicy : Fix for incorrect input device selection" into lmp-mr1-devEric Laurent2014-12-161-0/+3
| | |\ \
| | | * | audiopolicy : Fix for incorrect input device selectionEric Laurent2014-12-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some VoIP applications do not use source as VOICE_COMM but MIC and policy manager ignores the force usage in that case and selects handset-mic as input device even when BT-SCO headset is connected. Check the force usage for the AUDIO_SOURCE_MIC as well. Bug: 18606571 Change-Id: I5d5010ab396f85bf58573943c91fd815f39f57c1
* | | | | am 7f1295f5: am 9632d33e: am cd71a69d: audio: Force audio to Speaker if ↵Eric Laurent2014-12-161-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | requested during VOIP call * commit '7f1295f5cf27127601ea15c31b6c144ff28d2a8b': audio: Force audio to Speaker if requested during VOIP call
| * | | | am 9632d33e: am cd71a69d: audio: Force audio to Speaker if requested during ↵Eric Laurent2014-12-161-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | VOIP call * commit '9632d33e21ec2631c75cc949e0c92c351fd6a447': audio: Force audio to Speaker if requested during VOIP call
| | * | | audio: Force audio to Speaker if requested during VOIP callEric Laurent2014-12-161-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getDeviceForStrategy is returning AUDIO_DEVICE_OUT_USB even when setForceUse is called with Speaker during VOIP call. Actual Intention is to route audio for phone strategy to USB device even after setForceUse is called with Speaker when not in voice call. It is supposed to exclude VOIP call too Added additional check for MODE_IN_COMMUNICATION so that it returns SPEAKER when setForceUse is called with speaker Bug: 18758599 Change-Id: I1c51128cc1c7bfce1cf6f1fde60b428d3a9379fc
* | | | am 045513fc: am 0fd52ac2: am 6eac9e2f: Merge "Camera2Client: flush requests ↵Chien-Yu Chen2014-12-161-0/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | in stopPreviewL" into lmp-mr1-dev * commit '045513fc55cd500225071c11b06e1f4bb133681f': Camera2Client: flush requests in stopPreviewL
| * | | 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 f750da42: am 23085662: am c73ca6ef: audio policy: fix remote mic captureEric Laurent2014-12-152-17/+43
|\ \ \ | |/ / | | | | | | | | | * commit 'f750da42246d064c838904869d2d6ff9332c6158': audio policy: fix remote mic capture
| * | 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 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