summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* AudioPolicyService: Synchronize access to AudioPolicyManagerHaynes Mathew George2015-11-071-0/+1
| | | | | | | Synchronize access to APM when getDevicesForStream is called on APM. Change-Id: I2ba6922341f035375270b02000ef5a7e078f6b5a
* libcameraservice: Fix nullptr crash when no client.Tom Keel2015-11-071-2/+4
| | | | | | | | | | | | This change prevents a crash in the camera service when the camera HAL notifies the service about the absence of a removable camera and there happens to be no client connected to the service. It checks that the pointer returned from clientToDisconnect.get() is non-null before trying to dereference it (as is done in existing code immediately below this change). Change-Id: I8055654bac980542e63ea7f52bf897eaafbc09bc Signed-off-by: Tom Keel <thomas.keel@intel.com>
* Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-0539-518/+832
|\ | | | | | | | | | | Android 6.0.0 release 26 Change-Id: I8a57007bf6efcd8b95c3cebf5e0444345bdd4cda
| * Camera3Device: Change HFR request thread priority to 1Chien-Yu Chen2015-10-011-1/+1
| | | | | | | | | | | | | | | | | | Based on periods of the request thread and audio threads with SCHED_FIFO policy, 1 is a more reasonable priority for HFR request thread. Bug: 24427480 Change-Id: I91f0066a0e114fc83abcc6a604ecbaa72c6a34e8
| * Camera3Device: Bookkeeping reprocess shutters separatelyChien-Yu Chen2015-09-302-12/+27
| | | | | | | | | | | | | | | | Bookkeeping reprocess shutters separately so regular and reprocess shutters together don't need to come in order. Bug: 24497512 Change-Id: I4aaf22045131e9e2e26bf163f7df9ff4c5cd6259
| * CameraService: Use SCHED_FIFO for request queue thread in HFREino-Ville Talvala2015-09-269-233/+22
| | | | | | | | | | | | | | | | | | | | - Move SchedulingPolicyService from audioservice to mediautils - When starting up a high speed stream config, set request queue thread to SCHED_FIFO using SchedulingPolicyService Bug: 24227252 Change-Id: I224b59142bd111caf563779f55cddd62385b9bac
| * Merge "audio policy: fix preemtible capture race" into mnc-dr-devEric Laurent2015-09-243-3/+41
| |\
| | * audio policy: fix preemtible capture raceEric Laurent2015-09-223-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because a preemtible capture session can preempt another one, we end up in an endless loop situation were each session is allowed to restart after being preempted, thus preempting the other one which restarts and so on. To avoid this situation, we store which audio session was preempted when a particular input started and prevent preemption of this active input by this session. We also inherit sessions from the preempted input to avoid a 3 way preemption loop etc... Bug: 24007220. Change-Id: I0eab5299440ef3ab9e987635dc9a300cf42f2c79
| * | AudioPolicyService: fix race in AudioCommandThreadEric Laurent2015-09-231-8/+16
| |/ | | | | | | | | | | | | | | | | | | | | Fixe race condition in AudioCommandThread::threadLoop() where a command can be inserted in first position in the queue after the sleep time has been calculated causing a longer delay than expected. Also fix a failure to hold a wake lock while commands are still in the queue. Bug: 22707905. Change-Id: I813626986677bf00106acb37ee20d3dd75d5cf33
| * audio policy: bind setMode() and setPhoneState() operationsEric Laurent2015-09-161-1/+5
| | | | | | | | | | | | | | | | | | | | No routing operation should be allowed between setMode() and setPhoneState() when starting a call as the audio HAL relies on a precise sequence of mode change and routing change to select the initial audio device for the call. Bug: 24083591. Change-Id: I2d5ef62c11cf7aedc2ec7ca5e5fadd7ac875afbc
| * Merge "AudioPolicy: don't always change ACCESSIBILITY volume" into mnc-dr-devJean-Michel Trivi2015-09-161-1/+3
| |\
| | * AudioPolicy: don't always change ACCESSIBILITY volumeJean-Michel Trivi2015-09-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Only change the volume for AUDIO_STREAM_ACCESSIBILITY when changing the media volume. Bug 23366575 Change-Id: Ic42c726ec4d47615c20500c20e4d43cef159b3c6
| * | Merge "Camera: API1 shim: select better default FPS range" into mnc-dr-devYin-Chia Yeh2015-09-151-2/+2
| |\ \ | | |/ | |/|
| | * Camera: API1 shim: select better default FPS rangeYin-Chia Yeh2015-09-111-2/+2
| | | | | | | | | | | | | | | Bug: 23992350 Change-Id: Ie86b24d9e5ea753c6dfc2e5526d371b339be96a1
| * | Merge "Force fixed volume for TTS stream" into mnc-dr-devEric Laurent2015-09-141-4/+4
| |\ \
| | * | Force fixed volume for TTS streamEric Laurent2015-09-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always play Transmitted Through Speaker stream at max volume instead of tracking media stream volume. Bug: 23729461. Change-Id: I61021f59617bb851a4cd7da80924e587029e96a3
| * | | Merge "Camera3Device: Signal buffer returned after it failed" into mnc-dr-devChien-Yu Chen2015-09-121-1/+4
| |\ \ \
| | * | | Camera3Device: Signal buffer returned after it failedChien-Yu Chen2015-09-111-1/+4
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signal buffer returned even after it failed so the thread waiting for it can wake up sooner. Bug: 23981045 Change-Id: Iccbcc7ece2e0f6204da9c54f2bdd96ff6843a8f5
| * | | Merge "Workaround static fast track start-after-stop issue" into mnc-dr-devAndy Hung2015-09-121-1/+4
| |\ \ \
| | * | | Workaround static fast track start-after-stop issueAndy Hung2015-09-111-1/+4
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 23291988 Bug: 23614327 Bug: 23924081 Change-Id: Id1a519ed4bb2a6f4cb197da8450f7069b55c0d48
| * | | Add DUMP permission check to ResourceManagerService.dcashman2015-09-111-0/+9
| | | | | | | | | | | | | | | | | | | | Bug: 23999740 Change-Id: I3165404add455528b22951ba47b682a075b50087
| * | | Reduce DUMP permission denial output to one line.dcashman2015-09-111-1/+1
| | |/ | |/| | | | | | | | | | Bug: 23940813 Change-Id: I0060dbaff5cd0c3d028ac5cd7aba7da3f0371150
| * | audio flinger: force audio path start from normal mixerEric Laurent2015-09-101-0/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | The audio HAL wakes up and configures the audio path when receiving the first write() in standby state. This causes a certain amount of process to take place in the mixer threads which is problematic for fast mixer running at FIFO priority. We now force a fake write() of 0 bytes from normal mixer to trigger the audio path configuration before starting the fast mixer. Bug: 23791972. Change-Id: I54311b337fda956444846f5d2f53a3263d54e04b
| * Merge "Revert "Do not acknowledge flush() on start() for static tracks"" ↵Eric Laurent2015-09-091-6/+3
| |\ | | | | | | | | | into mnc-dr-dev
| | * Revert "Do not acknowledge flush() on start() for static tracks"Eric Laurent2015-09-091-6/+3
| | | | | | | | | | | | | | | | | | | | | This reverts commit cafe86a9cb6625bb1ec6383e16e28e4c9e455f87. Bug: 23924093. Change-Id: I186d1013b06a286eca93c30bb9b3545dc36695ff
| * | CameraService: Add more systracing, fix module init orderEino-Ville Talvala2015-09-092-14/+84
| |/ | | | | | | | | | | | | | | | | | | | | | | Improve debugging of performance of concurrent calls to the service. - Add ATRACE calls to camera service entry points - Add ATRACE calls for camera HAL module calls - Ensure that camera module init method is called before all others Bug: 23718257 Bug: 23933447 Change-Id: I2a025866ab39eda3962877120cab13a063c7727e
| * Merge "Do not acknowledge flush() on start() for static tracks" into mnc-dr-devAndy Hung2015-09-081-3/+6
| |\
| | * Do not acknowledge flush() on start() for static tracksAndy Hung2015-08-241-3/+6
| | | | | | | | | | | | | | | Bug: 22938515 Change-Id: I1de653de169a3fbbaa693da6057897ea57772447
| * | Merge "CameraService: Link to client binder death at end of connect" into ↵Eino-Ville Talvala2015-09-052-8/+11
| |\ \ | | | | | | | | | | | | mnc-dr-dev
| | * | CameraService: Link to client binder death at end of connectEino-Ville Talvala2015-09-042-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If, within a binder Looper thread, a Binder object death notifier is registered, and then a nested Binder transaction is begun, that transaction may process a death notification callback for the just-registered object, if it was dead at the time of registration. This can lead to an unexpected nested call into the service, and cause deadlock. To avoid this, move the death notifier registration to the end of handling the connect transaction. Also remove one extra bit of disconnect logging. Bug: 23525545 Change-Id: If01cbaf42704f55134118afefc9a8f7bdb014e09
| * | | Merge "Camera3Device: Clean up next request batch variable" into mnc-dr-devChien-Yu Chen2015-09-052-52/+41
| |\ \ \ | | |/ / | |/| |
| | * | Camera3Device: Clean up next request batch variableChien-Yu Chen2015-09-042-52/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the Vector of next requests a RequestThread member variable to avoid memory allocation in every threadloop. Bug: 23360060 Change-Id: I4f33e5c49f0f4deb1f9f45bada0909da748849e4
| * | | Merge "Camera3Device: Support batch requests" into mnc-dr-devChien-Yu Chen2015-09-048-199/+387
| |\ \ \ | | |/ /
| | * | Camera3Device: Support batch requestsChien-Yu Chen2015-09-038-199/+387
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor request threadLoop to three parts: waiting for next batch of requests, preparing HAL requests and output buffers for next batch of requests, and submitting the batch of requests to HAL. Set the batch size to the size of the request list if it's a video recording request in a high speed video configuration. Add a flush lock so that HAL's flush() won't be called while submitting a batch of requests. Bug: 23360060 Change-Id: Icd395b1f955a9b336eec6fa5aff6b17741ce08c7
| * | | CameraService: Treat TOP_SLEEPING same as TOP for priority.Eino-Ville Talvala2015-09-032-0/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When arbitrating between camera clients, treat processes in the TOP_SLEEPING state with the same high priority as processes in the TOP state. This resolves race conditions during lock screen handoffs between clients such as face unlock (a bound foreground process) and a secure camera app (the topmost activity, but transitioning from TOP_SLEEPING to TOP asynchronously from the activity lifecycle callbacks). Bug: 23731720 Change-Id: I92c3f8f561c7725627826c0ba3dc926e99af746c
| * | am fe751bea: Camera: Fix flashlight deadlockChien-Yu Chen2015-09-022-3/+5
| |\ \ | | | | | | | | | | | | | | | | * commit 'fe751bea0d3eedd6e817aebf4e457425b82e7117': Camera: Fix flashlight deadlock
| | * | Camera: Fix flashlight deadlockChien-Yu Chen2015-09-012-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a dedicated mutex for torch UID map so it won't cause a deadlock after flashlight app gets killed while the torch is on. Bug: 23722318 Change-Id: I228377aa0412052d56b6b948361d9abaecbbc686
| * | | Camera3Device: Don't hold mutex during HAL device close.Eino-Ville Talvala2015-08-281-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HAL device shutdown will likely need to wait on various events and queues to drain, and holding the mutex will prevent, for example, error notifications from being processed. This can lead to deadlocks. Bug: 23501571 Change-Id: I873ac23ef30545adf533e7839445448573ab5048
| * | | CameraService: Notify camera service proxy of device statusEino-Ville Talvala2015-08-218-6/+74
| | |/ | |/| | | | | | | | | | | | | | | | | | | Send the camera proxy service in system server updates to camera device state: opened/closed/active/idle. Bug: 23393557 Change-Id: Id7c70f134821efa34af8f6e7b4caa4c2ab128ebc
| * | am e857d28d: Merge "TimestretchBufferProvider: getNextBuffer should follow ↵Andy Hung2015-08-211-23/+26
| |\ \ | | |/ | | | | | | | | | | | | | | | API" into mnc-dev * commit 'e857d28d48e6088d4cf5fcbed7f411c73622b388': TimestretchBufferProvider: getNextBuffer should follow API
| * | Merge "Add experimental camera session prepare API." into mnc-dr-devRuben Brunk2015-08-1710-13/+103
| |\ \
| | * | Add experimental camera session prepare API.Ruben Brunk2015-08-1410-13/+103
| | | | | | | | | | | | | | | | | | | | Bug: 18949148 Change-Id: I8f73e68ea2e3acc60d98954106f364d13f439a82
| * | | am bad4358c: Camera: Add camera type to ICameraService.getNumberOfCameras.Eino-Ville Talvala2015-08-162-14/+96
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'bad4358c83c7daaf9eeb8542c15eea4f473c884c': Camera: Add camera type to ICameraService.getNumberOfCameras.
| * \ \ \ am 3ba0c6ec: Merge "Fix deadlock conditions in Camera3Device." into mnc-devRuben Brunk2015-08-132-20/+54
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '3ba0c6ec009aa675d3433cd6c12af173874787bd': Fix deadlock conditions in Camera3Device.
| * | | | Merge "audio policy: refine TTS stream mute management" into mnc-dr-devEric Laurent2015-08-132-2/+16
| |\ \ \ \
| | * | | | audio policy: refine TTS stream mute managementEric Laurent2015-08-122-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not mute the TTS stream if a dedicated output for TTS is available. Bug: 22100304. Change-Id: Ic126100ce1144f765bc0ae42c8ea87fa47cfb822
* | | | | | Merge branch 'LA.BF64.1.2.2_rb4.6' of ↵Steve Kondik2015-11-042-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://codeaurora.org/platform/frameworks/av into cm-13.0 Change-Id: Iec8118b9a24fafe47e4006fca8a8e993bacb5ba8
| * | | | | | audio policy: move output handle to AudioOutputDescriptor base classDhananjay Kumar2015-10-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output handle of AudioOutputDescriptor is required by derived implementation of some AudioPolicyManager methods. These methods need to access attributes of an output which is not accessible through AudioOutputDescriptor base class unless output handle is made available here. Change-Id: I96ef9fd1c5a94874acb897245501ba2f9c9ab0c0
* | | | | | | cameraservice: Resolve message vs start/stop preview racesRicardo Cerqueira2015-10-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the mutex in start/stopPreview to include the metadata message management. Fast start/stop sequences could (and would) eventually cause the messages to be enabled/disabled out of sequence (or while the camera wasn't ready for it) This is a port of I367bc45729ce2e858fea972f35e881a755c6021a from cm-11 Change-Id: I9a065f951f628d1c550acbac18493b9ad3853d03
* | | | | | | camera: add ability for a device to specify MAX_CAMERASDan Pasanen2015-10-302-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3db99ea4eff63aab3448efe7b2eb51366c658c03