summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "FastMixer use FastThread and FastMixerState use FastThreadState"Glenn Kasten2014-04-013-18/+13
|\
| * FastMixer use FastThread and FastMixerState use FastThreadStateGlenn Kasten2014-03-313-18/+13
| | | | | | | | Change-Id: I594c973e9f575113bdefee6f4cf8c29d8beac1f3
* | Merge changes I5748f47d,I3f074933Glenn Kasten2014-04-014-1/+117
|\ \ | |/ | | | | | | | | * changes: Add FastThread.h Add FastThreadState
| * Add FastThread.hGlenn Kasten2014-03-311-0/+38
| | | | | | | | Change-Id: I5748f47dbfa42c14cc93973742e05ac963bf3ba8
| * Add FastThreadStateGlenn Kasten2014-03-313-1/+79
| | | | | | | | Change-Id: I3f07493375ace6e5cfdcd02ad90c4b6fad543b0c
* | Add FIXMEs to createRecord for fast captureGlenn Kasten2014-03-312-9/+13
|/ | | | Change-Id: I759be200fae32969212c52a409f46f2e704081e3
* Merge "Mark the logging heap read-only to media.log service"Glenn Kasten2014-03-281-1/+1
|\
| * Mark the logging heap read-only to media.log serviceGlenn Kasten2014-03-181-1/+1
| | | | | | | | Change-Id: Ie26a9e7e37c951774c71d2c53886db52dd5479aa
* | Merge "Camera3: fix HAL3.x version check issue"Zhijun He2014-03-275-5/+17
|\ \
| * | Camera3: fix HAL3.x version check issueZhijun He2014-03-275-5/+17
| | | | | | | | | | | | | | | | | | Camera service should support HAL3.x instead of only HAL3.0. Bug: 13609405 Change-Id: If7e86f9abe019547fc0be2e11337551cd7c57870
* | | Fix the buildEric Laurent2014-03-262-5/+5
| | | | | | | | | | | | Change-Id: I2169a3d26f4e35e5cfa35a1264175aab6ac4db41
* | | Merge "audio policy: remove obsolete AudioPolicyManager class members"Eric Laurent2014-03-272-38/+0
|\ \ \
| * | | audio policy: remove obsolete AudioPolicyManager class membersEric Laurent2014-03-262-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove mHasA2dp, mHasUsb and mHasRemoteSubmix members from AudoPolicyManager. They are not needed any more since we use device descriptors with additional attributes. Also remove obsolete limitation on device address length (MAX_DEVICE_ADDRESS_LEN). Change-Id: Iffe760a521692a4b50be3f6b935af84afb61bb86
* | | | Merge "audio policy: use new audio device representation"Eric Laurent2014-03-272-281/+549
|\ \ \ \ | |/ / /
| * | | audio policy: use new audio device representationEric Laurent2014-03-262-281/+549
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Represent audio devices with more attributes than just the type (audio_device_t). This is in preparation for new routing APIs allowing device selection based on more criteria than just the type (address, channel mask...) A new class DeviceDescriptor is created and used by functions needing more information than just the device type. Bit fields for available and supported input or output devices are replaced by vectors of device descriptors. Each available device is allocated a unique ID for future use. Removed obsolete mA2dpDeviceAddress, mScoDeviceAddress and mUsbCardAndDevice fields replaced by address stored in DeviceDescriptor. Policy decisions like getDeviceForStrategy() are still based only on the device type. Change-Id: I5de3b3ffb12ff8dcfb746782ab1e6b15bf040d0c
* | | | Merge "Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>"Glenn Kasten2014-03-261-12/+12
|\ \ \ \
| * | | | Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>Glenn Kasten2014-03-261-12/+12
| | |/ / | |/| | | | | | | | | | Change-Id: Id6b1aa17558eb73e17f22b8eab6cd02e00a96dff
* | | | Merge "Use LOG_ALWAYS_FATAL instead of LOG_FATAL"Glenn Kasten2014-03-264-15/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Use LOG_ALWAYS_FATAL instead of LOG_FATALGlenn Kasten2014-03-264-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | LOG_FATAL is compiled out in most builds, so the assertion checks were not being performed. Change-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35
* | | | Merge "Use symbolic constants from <system/audio.h>"Glenn Kasten2014-03-261-1/+1
|\ \ \ \
| * | | | Use symbolic constants from <system/audio.h>Glenn Kasten2014-03-251-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | AUDIO_INTERLEAVE_* AUDIO_STREAM_MIN AUDIO_SESSION_ALLOCATE Change-Id: I31dd6f327204685e50716079ce21c4ba206dff11
* | | | Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>"Glenn Kasten2014-03-261-2/+2
|\ \ \ \
| * | | | Use symbol AUDIO_DEVICE_NONE from <system/audio.h>Glenn Kasten2014-03-251-2/+2
| |/ / / | | | | | | | | | | | | Change-Id: I61f882c5e7c949bf00d3bfc745ebf3b5e1c42a58
* | | | Merge "Fix uses of KeyedVector"Glenn Kasten2014-03-261-0/+1
|\ \ \ \
| * | | | Fix uses of KeyedVectorGlenn Kasten2014-03-251-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constructor for AudioFlinger::mAudioHwDevs was missing, and so AudioFlinger::findSuitableHwDev_l() could return an undefined pointer if a non-0 module wasn't found. A KeyedVector of Plain Old Data (POD) element type must specify the default value in the constructor, or else the default will be undefined. Minor: - Parameter had wrong type in constructor for AudioSystem::gOutputs. - Remove obsolete AudioSystem::gStreamOutputMap. Change-Id: I9841493e018440e559d8b8b0e4e748ba2b2d365b
* | | | Revert "camera: Fix setParameters for Preview FPS single/range values"Eino-Ville Talvala2014-03-261-116/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Causes a regression on some devices, so reverting until we're in a position to fix those devices. This reverts commit 9078a1b3b9f9c0c48046ade0e8e18b0d79a659db. Bug: 13563098 Change-Id: I7aedd01fde8b8fdee77e972ec395f0ecadbf8ccb
* | | | Merge "Document AudioFlinger::nextUniqueId()"Glenn Kasten2014-03-262-2/+13
|\ \ \ \ | |_|/ / |/| | |
| * | | Document AudioFlinger::nextUniqueId()Glenn Kasten2014-03-252-2/+13
| |/ / | | | | | | | | | Change-Id: Iafe96f1c10bd85cb23a2553945ca68aa601dc2eb
* | | am a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
|\ \ \ | |/ / |/| | | | | | | | * commit 'a1aaaf86cd04eabaf961a30d7b0a9fa857089862': CameraService: deadlock fix
| * | am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '4f53fe74051026e6635ba5bdbed4f1898cb66028': CameraService: deadlock fix
| | * | CameraService: deadlock fixKalle Lampila2014-03-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Release lock before return from CameraService::dump() Change-Id: Ia20b0921fc675a284f3b7f8d26e0e3596b5a8774 Signed-off-by: Kalle Lampila <kallex.lampila@intel.com>
* | | | Merge "Camera3: Fix flush call deadlock"Zhijun He2014-03-252-1/+12
|\ \ \ \
| * | | | Camera3: Fix flush call deadlockZhijun He2014-03-232-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flush shouldn't call waitUntilDrained directly, as they are all API calls with mLock and mInterfaceLock held. Move the waitUntilDrained implementation into waitUntilDrainedLocked to solve this issue. Change-Id: Id7d931091d5c11e12204790841097433515446db
* | | | | am 5c679d41: resolved conflicts for merge of 3d7c5002 to ↵Colin Cross2014-03-2420-70/+80
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '5c679d41714e42f153f6aeb492df54510a195bc1': libcameraservice: build 64-bit libcameraservice: fix 64-bit print format warnings
| * | | resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aospColin Cross2014-03-2120-70/+80
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ia6d87d56174d1388c1148fb55b6e4bc57d8666db
| | * | libcameraservice: build 64-bitColin Cross2014-03-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | libcameraservice builds fine for 64-bit, remove LOCAL_32_BIT_ONLY Change-Id: I9f28bc42dc424dee9b92e6ab092f86d3aa1419b7
| | * | libcameraservice: fix 64-bit print format warningsColin Cross2014-03-2119-69/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use PRId64 from inttypes.h to print nsecs_t (int64_t) Use %zu to print size_t Change-Id: I135620e0388db33587a8a7da393b48a45cb7275a
* | | | Merge "CameraService: Add support for burst capture and repeating burst."Jianing Wei2014-03-227-3/+259
|\ \ \ \
| * | | | CameraService: Add support for burst capture and repeating burst.Jianing Wei2014-03-217-3/+259
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10749500 Change-Id: I292a485b222e5cf97388d76bf0d956a6ac54bb2f
* | | | | Merge "audio policy: add option to use new policy manager"Eric Laurent2014-03-218-218/+997
|\ \ \ \ \
| * | | | | audio policy: add option to use new policy managerEric Laurent2014-03-188-218/+997
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add build option USE_LEGACY_AUDIO_POLICY to use either new audio policy manager in local AudioPolicyManager.cpp or the legacy AudioPolicyManagerBase.cpp via the policy HAL. New features will be implemented only by the new audio policy manager. Platform customiization will be by config file or new policy HAL. AudioPolicyClientImplLegacy.cpp copied from AudioPolicyClientImpl.cpp AudioPolicyInterfaceImplLegacy.cpp copied from AudioPolicyInterfaceImpl.cpp New implementations of AudioPolicyInterface and AudioPolicyClient talking directly to AudioPolicyManager. Change-Id: I7a320883a1de13de2c9295343e996addf2f3c154
* | | | | | camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-201-41/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12609188 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4db
* | | | | | resolved conflicts for merge of f40c4c56 to masterGlenn Kasten2014-03-191-9/+19
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | Change-Id: Ifd5385ad42a81e02e6a6afc6281f09fbff361671
| * | | | | am 36817364: Merge "Add libaudioresampler"Glenn Kasten2014-03-191-11/+18
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '36817364738d4c45adc3e448fbec02a9611bfeda': Add libaudioresampler
| | * | | | Add libaudioresamplerGlenn Kasten2014-03-191-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libaudioresampler is available in both 32-bit and 64-bit, unlike libaudioflinger which is currently 32-bit only. Bug: 8141282 Change-Id: I839f7b4e6aaed6984012ca6d514323f927669df6
* | | | | | am 0c282de7: am 77658a06: Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '0c282de73240b1efce64558ab2fa0a8be1f4292b': AudioPolicyService: malloc/delete pair
| * | | | | am 77658a06: Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '77658a069c81a0d5b4a1b81443b470a3ea64cab0': AudioPolicyService: malloc/delete pair
| | * | | | Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
| | |\ \ \ \
| | | * | | | AudioPolicyService: malloc/delete pairYou Kim2013-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75cd44ac0caccda9148faaa052c9e7a0c06d46d1 Signed-off-by: You Kim <you.kim72@gmail.com>
* | | | | | | Merge "audioflinger: OffloadThread fix for resume underrun"Eric Laurent2014-03-182-21/+27
|\ \ \ \ \ \ \