summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* DO NOT MERGE - audioflinger: fix recursive mutex lock in EffectHandle.Eric Laurent2017-03-221-7/+25
| | | | | | | | | | | | | | | Bug: 33661708 Bug: 32707507 Bug: 32095713 Test: run CTS AudioEffectTest#test5_0Command, Custom binder test CVE-2017-0479 CVE-2017-0480 Change-Id: I03f674f126c191143bd8bdfe236f793e975826a5 (cherry picked from commit 31a4598a1908b3ccac7ddb33c511ce66840aa911) (cherry picked from commit 8415635765380be496da9b4578d8f134a527d86b)
* DO NOT MERGE - improve audio effect framwework thread safetyEric Laurent2017-03-227-123/+225
| | | | | | | | | | | | | | | | | | | | | | - Reorganize handle effect creation code to make sure the effect engine is created with both thread and effect chain mutex held. - Reorganize handle disconnect code to make sure the effect engine is released with both thread and effect chain mutex held. - Protect IEffect interface methods in EffectHande with a Mutex. - Only pin effect if the session was acquired first. - Do not use strong pointer to EffectModule in EffectHandles: only the EffectChain has a single strong reference to the EffectModule. Bug: 32707507 CVE-2017-0479 CVE-2017-0480 CVE-2017-0499 Change-Id: Ia1098cba2cd32cc2d1c9dfdff4adc2388dfed80e (cherry picked from commit b378b73dd7480b584340b8028802c9ca2d625123) (cherry picked from commit 22e26d8ee73488c58ba3e7928e5da155151abfd0 with backport by <sultanxda@gmail.com>)
* Fix security vulnerability: potential OOB write in audioserverrago2017-03-131-0/+16
| | | | | | | | | Bug: 32705438 Bug: 32703959 Test: cts security test Change-Id: I8900c92fa55b56c4c2c9d721efdbabe6bfc8a4a4 (cherry picked from commit e275907e576601a3579747c3a842790bacf111e2) (cherry picked from commit b0bcddb44d992e74140a3f5eedc7177977ea8e34)
* Effect: Use local cached data for Effect commitAndy Hung2017-03-131-19/+38
| | | | | | | | | Test: POC, Cts Effect, BassBoost, EnvReverb, Equalizer, Test: LoudnessEnhancer, PresetReverb, Virtualizer, Visualizer Bug: 32220769 Change-Id: Iea96ba0daf71691ee8954cca4ba1c10fe827626e (cherry picked from commit dd79ccda92c1e9b982b2d0f8877d98e5258fbb73) (cherry picked from commit a155de4d70e0b9ac8fc02b2bdcbb2e8e6cca46ff)
* Effects: Check get parameter command sizeAndy Hung2017-02-031-0/+7
| | | | | | | | | | Test: Custom test. Bug: 32438594 Bug: 32624850 Bug: 32635664 Change-Id: I9b1315e2c02f11bea395bfdcf5c1ccddccbad8a6 (cherry picked from commit 3d34cc76e315dfa8c3b1edf78835b0dab4980505) (cherry picked from commit 26965db50a617f69bdefca0d7533796c80374f2c)
* soundtrigger: fix memory corruptionSam Mortimer2016-12-131-1/+1
| | | | | | | Fixes hotword on angler. Change-Id: Ic15a617c0f79f03785feaddd2dfa6deb90842a06 (cherry picked from commit 5f72b2213b9dc96ce91871398b539ad6aa653142)
* Merge tag 'android-6.0.1_r72' into HEADJessica Wagantall2016-10-062-8/+53
|\ | | | | | | | | | | Android 6.0.1 Release 72 (M4B30X) Change-Id: I617426a3fbf7a8d013c5be838ad4c80a00b61a5f
| * soundtrigger: add size check on sound model and recogntion dataEric Laurent2016-08-261-8/+30
| | | | | | | | | | | | | | | | Bug: 30148546 Change-Id: I082f535a853c96571887eeea37c6d41ecee7d8c0 (cherry picked from commit bb00d8f139ff51336ab3c810d35685003949bcf8) (cherry picked from commit ef0c91518446e65533ca8bab6726a845f27c73fd)
| * Add EFFECT_CMD_SET_PARAM parameter checkingAndy Hung2016-08-261-0/+29
| | | | | | | | | | | | Fix merge conflict to mnc-mr3-release Bug: 30204301 Change-Id: Ib9c3ee1c2f23c96f8f7092dd9e146bc453d7a290
* | libcameraservice: Don't pass NULL args on setCallbacks callirii2016-09-111-1/+13
| | | | | | | | | | | | | | | | | | | | | | *This fixes the torch light for cameras with hal 1 *This fix works on the htc m7ul *Fixed line length *Fixed unused parameter names Change-Id: I89c6112546e36dbcca099f4d5cd70371b2c5340a
* | audioflinger: Always process volume commands from a latest trackHaynes Mathew George2016-08-191-9/+3
| | | | | | | | | | | | | | | | | | Process them irrespective of whether the track is invalid. Ignoring to do so may lead to glitches/loud bursts in audio when a new track reuses the same output. CRs-Fixed: 1002448 Change-Id: I9afbdd221db3a7311eb0ec8bb75852cf5409084e
* | audioflinger: set flush pending on invalidating offload trackHaynes Mathew George2016-08-192-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On invalidating an offload track, the IAudioTrack instance is destroyed and the offload output is released. If it so happens that APM::getOutputForAttr for the new IAudioTrack is called before OffloadThread::prepareTracks_l checks and removes an invalid track, the same output can get reused. The side effect of this is data present in HAL and below from before the invalidate will be rendered before data from the new seek position is rendered. This is unexpected. To fix this, set hint to issue flush when an offload track is invalidated. Bug: 28566885 CRs-Fixed: 1002438 Change-Id: Ib6c38a3abb600598b87591bac90d03b7150d5216
* | Don't place large objects on the stackGlenn Kasten2016-08-191-5/+13
| | | | | | | | | | Bug: 25020816 Change-Id: Ife4da9fc3000e645f654f2eb28b37ad3a89d61f9
* | Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-022-0/+14
|\ \ | | | | | | | | | | | | | | | Android 6.0.1 Release 61 (MOB30Z) Change-Id: Ic86e42d5fb8f81fe5c4f58d2e76852829c609760
| * | DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleakEino-Ville Talvala2016-06-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Subtract address of a random static object from pointers being routed through app process. Bug: 28466701 Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
| * | Check effect command reply size in AudioFlingerAndy Hung2016-06-231-0/+6
| |/ | | | | | | | | Bug: 29251553 Change-Id: I1bcc1281f1f0542bb645f6358ce31631f2a8ffbf
* | audiopolicy: Constrain session events to music streamsSteve Kondik2016-07-181-0/+5
| | | | | | | | | | | | | | | | | | * We're really only interested in music streams right now, but events are being generated for all streams (system sounds, etc). * Constrain for now, in the future we will filter based on client registrations. Change-Id: Ic445052028c454eed146addebcdb28c4b26c4f20
* | Enforce permission for accessing fm tunerScott Mertz2016-07-084-0/+18
| | | | | | | | Change-Id: I13f3ba8fc9caaeee21597a2405a8c3629e985502
* | audiopolicy: engineconfigurable: Don't include the exampleDiogo Ferreira2016-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | When using the configurable policy engine, the audiopolicy makefile implicitly declares dependencies on the configuration files. However, the example folder already contains the example files which we wan't to override. This patch removes the example from the makefile inclusion path so that we can declare it on a per-device basis without getting errored out by duplicate module names. Change-Id: Ie47ebff6b13606c93630c017252ebaa204203a76
* | Revert "cameraservice: Run HAL3 in Non ZSL mode".Sanjeev Garg2016-05-061-1/+1
| | | | | | | | | | | | | | Reverting the Temp change. This reverts commit f300e17bf3451bf821ccc48c45b243c84ebaff7f. Change-Id: Ib11e38eb8edd7523cb6cdb21caa511152ee62e45
* | soundtrigger: fill in default extras from dspRoman Birg2016-05-041-0/+31
| | | | | | | | | | | | | | | | | | We seem to get an improper offset when getting the value from the DSP (offset 100, data size 1), when this happens, return a new phrase event with valid extras which are initialized to some default values. Change-Id: Ie041f78fec6bdbcd82286b54a7b7fb0c98c740f5 Signed-off-by: Roman Birg <roman@cyngn.com>
* | Merge tag 'android-6.0.1_r43' into HEADJessica Wagantall2016-05-031-0/+8
|\ \ | |/ | | | | | | | | | | Ticket: CYNGNOS-2373 Android 6.0.1 release 43 (MOB30J) Change-Id: Ie0ab546349bd8a7eed51c839fba28b809e433fd4
| * Camera3Device: Validate template IDChien-Yu Chen2016-03-251-0/+8
| | | | | | | | | | | | | | | | Validate template ID before creating a default request. Bug: 26866110 Bug: 27568958 Change-Id: Ifda457024f1d5c2b1382f189c1a8d5fda852d30d
* | audiopolicy: Add AudioSessionInfo APISteve Kondik2016-04-278-18/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This patch introduces a new API which allows applications to query the state of the audio effects system, and receive callbacks with the necessary information to attach effects to any stream. * In the future, this may come as part of the AudioPort system, but since that's an active area of development by Google, we will dodge it for now. * The policy now simply keeps a refcounted list of objects which hold various bits of stream metadata. Callbacks are sent on stream open/close to applications which might be listening for them. Change-Id: I2d554d36e1378f4eb7b276010a3bfe8345c22ecd
* | audiopolicy: Revert all session callback patches.Steve Kondik2016-04-227-212/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This has been rearchitected in a better way, as this feature turns out to be more difficult than it seems. * Reverting all of this stuff and rolling it into a single commit. This reverts commit c27a16c33c78a36482336a16199b1b8be794cea4. This reverts commit 32ef0556ae58ff6b7c6fe6fb0a17d3ff7f01de31. This reverts commit 489c9fb62f02e1d23d6d6c89b22f7d19c596e65e. This reverts commit a4123803d0a0e9e0c69faa4207d357cc74a65d58. This reverts commit e13b58b988ab642d4ae5ca6d0a89013510714956. This reverts commit 47f8c7303c9e2054f1492b02b6c7472385c52dc9. This reverts commit 0479d7c79a7fd6f112e8dc7e45c009cf6602dbaa. Change-Id: Iaed9f198d806aa414c95960713e8187c98db248b
* | audiopolicy: Fix notification not sent for session releaseSteve Kondik2016-04-222-4/+2
| | | | | | | | Change-Id: Ifba4025532debc50c7931d08a9bcd1593d9b1721
* | audiopolicy: Clean up the messSteve Kondik2016-04-196-208/+27
| | | | | | | | | | | | | | | | | | | | * Since we're not using the policy directly to auto-attach, let's clean it up and remove the unused stuff. * Also fixes notifications for session release. This reverts commit 47f8c7303c9e2054f1492b02b6c7472385c52dc9. Change-Id: Ibe65f427773c6ef012dde4f289d10e4089c094ea
* | audiopolicy: Update legacy policy for session callbacksSteve Kondik2016-04-161-12/+26
| | | | | | | | Change-Id: Id6f24195721a48dc5a0d3a7ff7fbee2bd8614128
* | frameworks/av: Fix LOG_NDEBUG compilation issuesLeena Winterrowd2016-04-132-1/+2
| | | | | | | | | | | | Fix compilation issues that appear when enabling LOG_NDEBUG. Change-Id: I87e9e5ac66157759dd6f521fab0dd346089a011a
* | cameraservice: Run HAL3 in Non ZSL modeAbhishek Kondaveeti2016-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ZSL mode is not working on HAL3 due to camera backend failures. Run HAL3 forcefully in Non zsl mode till the problem in camera backend fixed. This change will be reverted once the backend issue is fixed. CRs-Fixed: 956182 Change-Id: I1dfcda8eb0fe5cd2d9be6cb2e103f5fd84955ecb
* | audio: QTI resampler supports for 32 bit input formatZhou Song2016-04-133-10/+16
| | | | | | | | | | | | | | | | | | | | | | Configure QTI resampler as 32 bit input format to avoid losing precision. audioflinger: add channel count check to use QTI resampler Change-Id: I8f76dd82b72a0dd8b77343e77e0d0545e1be2114 CRs-Fixed: 940287 Change-Id: I7e1b8582cd6bb106ab0bd25f9bc1bd9e4092318b
* | audioflinger: Compile 192k resampler for 32 bit environmentRamjee Singh2016-04-131-2/+9
| | | | | | | | | | | | | | | | Current makefile compiles the resampler only for 64 bit environment. Allow compilation for 32 bit environment as well. CRs-Fixed: 735776 Change-Id: I626725551af73fc5ea98a7dbf87cacea9dbbc0ef
* | CameraClient: MTK SupportRicardo Cerqueira2016-04-111-0/+3
| | | | | | | | | | | | | | Return on MTK hardware, the HAL does this internally and duplicating it here causes an infinite loop. Change-Id: I5bdb925ddb49980747b58dfae4543f812cef4c7d
* | audiopolicy: Be a little smarter with auto-attachSteve Kondik2016-04-077-49/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * The edge cases, ZOMG! * Instead of relying on effects to be automatically attached, let's just always notify userspace and send a bit more information. This lets the application decide if effects should be attached rather than relying on a hard-coded configuration file. * Perform the setup in getOutputForAttr, but do it on the command thread so we don't block the client. OPO-593 Change-Id: I3900b349f2e895d51fa3a3dcc2de0c4bdf6dbc08
* | audio: Send effect session notifications after startOutput successSteve Kondik2016-04-052-5/+11
| | | | | | | | | | | | | | * Because we get a hellish firestorm during offload fallback, and our effects library really dislikes this. Change-Id: I22adb55d04502eedf03ce22f35f8b9f61de1c7b0
* | audio: use offload standby delay for direct pcmWeiyin Jiang2016-04-031-0/+2
| | | | | | | | | | | | | | | | | | Default standby delay for legacy direct is too aggressive for track offloaded use case. Using offload standby delay instead, which allows sufficient time for track transition before standby the output. CRs-Fixed: 982822 Change-Id: Ifd0e39c5b3fe4a4af9f444dbbad21ef1e1a5edfa
* | audio: allow standby for direct trackWeiyin Jiang2016-04-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | Delay standby for offload track use case is not suitable for direct track in PCM format, because player torn down doesn't necessarily happen. To avoid AP looping infinitely, allow standby right after direct track in PCM format is paused. CRs-Fixed: 986784 Change-Id: Id0026ac9891a12acc4affa446b2bc841559fcc28
* | audioflinger: clear mMixerBuffer if frame is not readyMohan Kumar2016-03-221-3/+15
| | | | | | | | | | | | | | | | Clear the mMixerBuffer if frame is not ready before the FastMixer starts processing. Otherwise it might result in large glitches on output device due to junk data present in the mixbuffer. Change-Id: I9f025234d4ac100f85d2ec67c06a8df4195bea98
* | CameraService: Fix cameraId type of onDeviceStatusChangedBin Chen2016-03-222-3/+3
| | | | | | | | | | | | | | The cameraId should be of type int, instead of camera_device_status_t. Change-Id: I26d587bb74f7100028f09928984c2e8dad6eebef Signed-off-by: Bin Chen <chen_bin@projectara.com>
* | libcameraservice: Allow media server to disconnect camera even unlockedWang, Jianfeng XA2016-03-221-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The camera service may fail to release the camera hardware instance in some use cases. When an application unlocked the camera before disconnect, disconnect from the application will not be accepted. And disconnect from media server will not be accepted also. Then, the camera hardware instance will not be released and a resource leak will be caused. Allow media server to disconnect the camera at all times even if the camera is unlocked. Change-Id: Icd5ed81bed242fa5947aa40ca85e4ca7fa7286e7
* | audio: Remove LEGACY_ALSA_AUDIO ifdefs from AudioPolicyManager.cppArne Coucheron2016-03-171-54/+0
| | | | | | | | | | | | This is moved to custom policy manager in HAL sources. Change-Id: I716580f7d3399f1628c26bd3b79bd6c6a52fbbf6
* | Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-102-3/+21
|\ \ | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/av into cm-13.0 Android 6.0.1 release 22
| * \ Camera: Disallow dumping clients directly am: c400396525 am: 795243686fEino-Ville Talvala2016-01-1410-6/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | am: fb5043a703 * commit 'fb5043a703f596b7393c1e24ca4b321b0f697293': Camera: Disallow dumping clients directly
| | * \ Camera: Disallow dumping clients directly am: c400396525Eino-Ville Talvala2016-01-1410-6/+37
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 795243686f * commit '795243686fe2e1c352732b47bcdb6ea9e9e7e39e': Camera: Disallow dumping clients directly
| | | * \ Camera: Disallow dumping clients directlyEino-Ville Talvala2016-01-1410-6/+37
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c400396525 * commit 'c4003965258404a19b99280ac0f475e2f290bf27': Camera: Disallow dumping clients directly
| | | | * | Camera: Disallow dumping clients directlyEino-Ville Talvala2016-01-1310-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera service dumps should only be initiated through ICameraService::dump. Bug: 26265403 Change-Id: If3ca4718ed74bf33ad8a416192689203029e2803
| * | | | | Camera: set mNumberOfNormalCameras correctlyYin-Chia Yeh2016-01-131-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6dd6c54651 * commit '6dd6c546513aa18dc1d7fba0f72d670edce34f77': Camera: set mNumberOfNormalCameras correctly
| | * | | | Camera: set mNumberOfNormalCameras correctlyYin-Chia Yeh2016-01-121-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to set the number correctly when a camera HAL is not present. Bug: 25951590 Change-Id: I666acf7a2a523c51f2c2ae88ff690ca9dccda08c
| * | | | audioflinger: fix standby delay on A2DP outputEric Laurent2016-01-121-3/+20
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that standby delay is never less than the audio flinger default on A2DP output. Due to variable latency and amount of buffering in A2DP sinks, an agressive standby delay could lead to truncated audio. Bug: 25830539. Change-Id: I38be37ad346f5f4bf8303d3db4e3e911bf637968 (cherry picked from commit 42537be61479e59c4718e1304364551c1454f63c)
| * | | Merge "Reduce lock time for dump to make sure not locked when calling back ↵Ronghua Wu2015-11-021-11/+26
| |\ \ \ | | | | | | | | | | | | | | | to IResourceManagerClient." into mnc-dr-dev