summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Track camera and flashlight usage in battery stats.Ruben Brunk2015-06-014-51/+205
| | | | | | Bug: 15986092 Change-Id: I9dc6828332e4091fd93bf2d82839e8e3862a2fc2
* 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
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | audio flinger: fix fuzz test crashEric Laurent2015-05-083-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
* | | | | | libstagefright: config resource manager with secure codec co-existing policy.Ronghua Wu2015-05-082-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I0d729782c1622f23e9c37b7a9231e58e3f807470
* | | | | | Merge "Kill a new user of stlport." into mnc-devDan Albert2015-05-081-2/+0
|\ \ \ \ \ \
| * | | | | | Kill a new user of stlport.Dan Albert2015-05-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/15193147 Change-Id: I20d21a040f0c2c6c291053fe02fdf82e33ed56a0 (cherry picked from commit 1b5a73358b72b8ff1bee05cc44d94b47b73ede44)
* | | | | | | Merge "mediaresourcemanager: add ServiceLog to track the calling history for ↵Ronghua Wu2015-05-087-13/+222
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dumpsys." into mnc-dev
| * | | | | | | mediaresourcemanager: add ServiceLog to track the calling history for dumpsys.Ronghua Wu2015-05-077-13/+222
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20637674 Change-Id: I9d74d98f8eb729a8681877f86419aa2c979f3b7c
* | | | | | | Merge "Revert "Enable full floating point path in AudioMixer"" into mnc-devEric Laurent2015-05-071-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Revert "Enable full floating point path in AudioMixer"Eric Laurent2015-05-071-3/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5b8fde71e08f57478ef25d040fc5f66294011ac6. temporary revert while we investigate. Bug: 20912450.
* | | | | Merge "Camera2: allow mixing regular/reprocess requests" into mnc-devChien-Yu Chen2015-05-072-11/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Camera2: allow mixing regular/reprocess requestsChien-Yu Chen2015-05-052-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow mixing regular and reprocess requests in a capture burst. Also call abandon() when deleting an input stream. Bug: 20537735 Change-Id: If8c7781038173ab21c73f5ddc32f53793cf86fd9
* | | | | Merge "audio policy: clarify use of mName field for audio devices" into mnc-devEric Laurent2015-05-075-37/+33
|\ \ \ \ \
| * | | | | audio policy: clarify use of mName field for audio devicesEric Laurent2015-05-065-37/+33
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio port field mName was used for two different purposes which caused a problem when exposing this information at the SDK API. Create a new "mTag" field storing the audio_policy.conf device tag if needed. Field "mName" is now used to store any additional name associated to a given device when available (e.g Manufacturer and model name for a USB device). Change-Id: I17fa872e4a3a2e1b7cbb807c6f72e095a8a2c9c5
* | | | | Make header functions "inline" to avoid warning when unused.Chih-Hung Hsieh2015-05-061-2/+2
| |_|_|/ |/| | | | | | | | | | | | | | | Change-Id: Iefac44f3c0e1c3fd4b19833d9692744100f92e00 (cherry picked from commit 5e9febef197a9852c833a0aedc6bfee179c4ae9e)
* | | | Merge "Implement audio device callback" into mnc-devEric Laurent2015-05-062-0/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Implement audio device callbackEric Laurent2015-05-062-0/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add class AudioSystem::AudioDeviceCallback notifying AudioSystem clients upon device selection change on a given input or output thread. Maintain a list of installed callback per I/O handle in AudioSystem and call registered callbacks when an OPEN of CONFIG_CHANGED event is received on IAudioFlingerClient::ioConfigChanged(). Add methods to AudioTrack and AudioRecord to add and remove device change callbacks. Add methods to AudioTrack and AudioRecord to query currently selected device. ioConfigChanged() events now convey the audio patch describing the input or output thread routing. Fix AudioRecord failure to start when invalidation is handled by start(). Change-Id: I9e938adf025fa712337c63b1e02a8c18f2a20d39
* | | Merge "CameraService: update android.control.availableModes" into mnc-devZhijun He2015-05-051-2/+37
|\ \ \