summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Improve volume input check for AudioMixer" into mnc-devAndy Hung2015-05-211-23/+88
|\
| * Improve volume input check for AudioMixerAndy Hung2015-05-211-23/+88
| | | | | | | | Change-Id: I5b656b123847529f2b76af2a68bd4e9b691882f4
* | Merge "audio flinger: do not call JAVA services until system is ready" into ↵Eric Laurent2015-05-214-50/+102
|\ \ | | | | | | | | | mnc-dev
| * | audio flinger: do not call JAVA services until system is readyEric Laurent2015-05-204-50/+102
| | | | | | | | | | | | | | | | | | | | | | | | Wait for system ready indication form AudioService before enabling calls to scheduling service or power manager. Bug: 11520969. Change-Id: I221927394f4a08fd86c9d457e55dd0e07949f0cf
* | | Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-devRuben Brunk2015-05-202-0/+15
|\ \ \ | |_|/ |/| |
| * | camera: Add AIDL interface for CameraServiceProxy.Ruben Brunk2015-05-202-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds an AIDL interface to allow the proxy camera service running in system server to accept RPCs from the camera service running in mediaserver. - Request an update to the valid user set from the proxy camera service when mediaserver restarts to initialize properly + avoid DOS after a crash. Bug: 21267484 Change-Id: Ib821582794ddd1e3574b5dc6c79f7cb197b57f10
* | | Merge "audio policy: fix direct output profile selection" into mnc-devEric Laurent2015-05-201-12/+44
|\ \ \
| * | | audio policy: fix direct output profile selectionEric Laurent2015-05-191-12/+44
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic in AudioPolicyManager::getProfileForDirectOutput() to select the direct output with most matching flags and not just the first compatible one. Also fixes issue 17783395 which was fixed by commit f7bc29b02 in lmp-tv-dev branch only but in a way that caused a regression for HW A/V sync (issue 19384172). Also removed duplicated code lines in getOutputForDevice() Bug: 20819715. Bug: 17783395. Bug: 19384172. Change-Id: I7fc793b37f9b53fabd92cab6b884ef85cfdafee4
* | | Merge "CameraService: Logcat conflicting devices on rejected open" into mnc-devEino-Ville Talvala2015-05-201-0/+4
|\ \ \
| * | | CameraService: Logcat conflicting devices on rejected openEino-Ville Talvala2015-05-191-1/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Already in dumpsys log, but also put into logcat for feedback reports Also fix a minor warning about an uninitialized variable. Bug: 21063372 Change-Id: I04b45932e4500ac72aaa1cb724abc8a82a0e70e8
* | | Merge "Update FastTrack channel conversion check" into mnc-devAndy Hung2015-05-191-3/+5
|\ \ \
| * | | Update FastTrack channel conversion checkAndy Hung2015-05-191-3/+5
| | | | | | | | | | | | | | | | Change-Id: Ia1a3124e6408859bf4d95ff9fd95dda6970a4a7f
* | | | Merge changes Iba5ccd18,I97e578f3 into mnc-devAndy Hung2015-05-192-43/+65
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix channel mask dump in AudioFlinger Allow creation of output endpoints with channel index masks
| * | | | Fix channel mask dump in AudioFlingerAndy Hung2015-05-191-43/+56
| |/ / / | | | | | | | | | | | | Change-Id: Iba5ccd1885775b14c44342c7b169a0672b93549b
| * | | Allow creation of output endpoints with channel index masksAndy Hung2015-05-191-0/+9
| | | | | | | | | | | | | | | | | | | | Bug: 21301523 Change-Id: I97e578f3da933f7086e4f431a199ed907f04cbc8
* | | | Merge "Camera: API1 shim: notify shutter correctly" into mnc-devYin-Chia Yeh2015-05-195-12/+65
|\ \ \ \ | |_|/ / |/| | |
| * | | Camera: API1 shim: notify shutter correctlyYin-Chia Yeh2015-05-195-12/+65
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Previous implementation only notifies the callback when we receive full capture result. This implementation notifies the callback once HAL sends capture start callback. Bug: 12530628 Change-Id: Ibf71d532b5cf649514b316e35683c217021698b4
* | | Merge changes Ia529bf53,I10888d0b into mnc-devChih-Hung Hsieh2015-05-152-12/+0
|\ \ \ | |/ / |/| | | | | | | | | | | * changes: Enable building with clang/llvm. Enable clang compilation.
| * | Enable building with clang/llvm.Chih-Hung Hsieh2015-05-151-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | The llvm bug https://llvm.org/bugs/show_bug.cgi?id=21572 was fixed. BUG: 18373866 Change-Id: Ia529bf53267f636880515ccefb4ca1cf7d731baf (cherry picked from commit 7630881d853b130e2c1f11cb2dafebe684bcfa91)
| * | Enable clang compilation.Chih-Hung Hsieh2015-05-151-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | Previous clang/llvm bug was fixed. BUG: 18373866 Change-Id: I10888d0bc1cf8f621c719a705b1f77ff0d0ecca5 (cherry picked from commit 1ab4ff2355e934517751e40573e4163cb49b1676)
* | | camera2: Fix work-profile eviction handling.Ruben Brunk2015-05-142-39/+78
| | | | | | | | | | | | | | | Bug: 20124384 Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8
* | | Merge "camera2: Fix empty set handling for eviction." into mnc-devRuben Brunk2015-05-141-9/+11
|\ \ \ | |_|/ |/| |
| * | camera2: Fix empty set handling for eviction.Ruben Brunk2015-05-141-9/+11
| | | | | | | | | | | | | | | Bug: 20304829 Change-Id: I120ed6e41ca592c3770797a5fb1e5ce556543949
* | | Merge "Camera: update CameraModule deriveKey" into mnc-devYin-Chia Yeh2015-05-131-0/+12
|\ \ \
| * | | Camera: update CameraModule deriveKeyYin-Chia Yeh2015-05-071-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To add derived keys into availableCharacteristicsKey. Bug: 20883751 Change-Id: I49d6d1bb79e6f31825dbfdebb039acbd5d9abe68
* | | | Merge "Camera: Cleanup to prepare() implementation" into mnc-devEino-Ville Talvala2015-05-132-11/+6
|\ \ \ \
| * | | | Camera: Cleanup to prepare() implementationEino-Ville Talvala2015-05-132-11/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Mutexes _might_ be a good idea - Don't be surprised by behavior that's expected - Use the existing logging macros Bug: 20537148 Change-Id: Ie62985a786d7e6645b4e4fe019dd98b02891a1f7
* | | | Merge "audio flinger: fix record permission check" into mnc-devEric Laurent2015-05-131-1/+1
|\ \ \ \
| * | | | audio flinger: fix record permission checkEric Laurent2015-05-121-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 21022842. Change-Id: Iff7c2ce715fa5e7ff029dbf6a3f27c6a8bc0735d
* | | | Merge "camera2: Fix arbitration priority calculation." into mnc-devRuben Brunk2015-05-132-42/+6
|\ \ \ \ | |/ / / |/| | |
| * | | camera2: Fix arbitration priority calculation.Ruben Brunk2015-05-122-42/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | - Simplify priority calculation + handle constants added for device sleep: FOREGROUND_SERVICE and TOP_SLEEPING. Bug: 19186859 Change-Id: Ia2a5517cd3150deaccb58a0aa1eaa583cb769add
* | | Merge "Update sampling rate to 192kHz for devices" into mnc-devAndy Hung2015-05-124-7/+13
|\ \ \
| * | | Update sampling rate to 192kHz for devicesAndy Hung2015-05-124-7/+13
| | | | | | | | | | | | | | | | Change-Id: I0a83206be51d7ae18ccf85b94b2127356307be69
* | | | Merge "Work around bug in offload driver" into mnc-devMarco Nelissen2015-05-121-2/+12
|\ \ \ \
| * | | | Work around bug in offload driverMarco Nelissen2015-05-121-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bug in the offload driver that causes the last offload buffer(s) to be dropped unless the device is on power or holding a wake lock. To avoid truncated playback, we now hold a wake lock during the drain phase of offloaded playback. Bug: 19928717 Change-Id: I8df22e965ec791448aa5d9b74e743f48ef886fc4
* | | | | Merge "mediaresourcemanager: change resource manager service log to use ring ↵Ronghua Wu2015-05-126-397/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | buffer." into mnc-dev
| * | | | | mediaresourcemanager: change resource manager service log to use ring buffer.Ronghua Wu2015-05-116-397/+62
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move the ring buffer implementation from libcameraservice to media include. also add line prefix support to the service log. Bug: 20637674 Change-Id: Ib6b32f31abe92c42644ef7012f1e3d46220ccfbd
* | | | | Fail gracefully when camera app op is not enabled.Svetoslav2015-05-121-1/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I0c7c1dca1c0966efaf30bcfe12636953683712ab
* | | | | Merge "Revert "Add camera app op - camera"" into mnc-devSvetoslav Ganov2015-05-123-89/+55
|\ \ \ \ \
| * | | | | Revert "Add camera app op - camera"Svetoslav Ganov2015-05-123-89/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not needed duplication of work This reverts commit 32fa6d0e65dbf956e253a1006e9419dce2fe75c9. Change-Id: I2c81b0dacb2ed99c408c79c1f9e22a4baa564494
* | | | | | Merge "Support channel index masks for output hal" into mnc-devAndy Hung2015-05-122-40/+8
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Support channel index masks for output halAndy Hung2015-05-062-40/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib3e61ff6faf91c71b85102b5d77f90f124c08220
* | | | | | Merge "Allow 8 channels in RecordThread" into mnc-devAndy Hung2015-05-121-3/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Allow 8 channels in RecordThreadAndy Hung2015-05-051-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I738d4975188695e568015e1bc64d160550e958f5
* | | | | | audiopolicy: Use AUDIO_OUTPUT_FLAG_TTS for TTS streamRavi Kumar Alamanda2015-05-111-0/+3
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use AUDIO_OUTPUT_FLAG_TTS by default for TTS stream to see if the HW supports a dedicated output for the same. If not, fallback to primary output as it is done currently. Change-Id: Ifb2ef7066e75c61fe4c1b9783c12627386a00ea5
* | | | | Merge "AudioMixer: fix for volume ramp in float mode" into mnc-devEric Laurent2015-05-091-1/+2
|\ \ \ \ \
| * | | | | AudioMixer: fix for volume ramp in float modeEric Laurent2015-05-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20912450. Bug: 19952126. Change-Id: I1ff3c3f4c0dd673bbbc17ce8da14d446fdb7e8a8
* | | | | | Merge "Revert "Revert "Enable full floating point path in AudioMixer""" into ↵Eric Laurent2015-05-091-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | Revert "Revert "Enable full floating point path in AudioMixer""Eric Laurent2015-05-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5dcaebbea5dca62ca55d6137777caa67fc757dd6. Change-Id: I8bfc668baf53dc03a9516c50e2a4d625ec767d0a
* | | | | | | Merge "audio flinger: fix fuzz test crash" into mnc-devEric Laurent2015-05-083-7/+22
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |