summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* am 203836b7: am b8d6efba: Camera2: Don\'t hold locks while waiting to sync.Eino-Ville Talvala2012-10-241-33/+35
|\ | | | | | | | | * commit '203836b7584ccb7787202578259d27d70a8a3ede': Camera2: Don't hold locks while waiting to sync.
| * Camera2: Don't hold locks while waiting to sync.Eino-Ville Talvala2012-10-241-33/+35
| | | | | | | | | | Bug: 7409877 Change-Id: Ia3a0bc4f0ab4e19fca868ba04a870cf8e8ee7adb
* | am 9e83f44c: am 6ccc3c34: Merge "Camera2: Increase mode update timeout." ↵Eino-Ville Talvala2012-10-231-1/+1
|\ \ | |/ | | | | | | | | | | into jb-mr1-dev * commit '9e83f44c0b310a72a080c006ebc3c07bdccc7027': Camera2: Increase mode update timeout.
| * Merge "Camera2: Increase mode update timeout." into jb-mr1-devEino-Ville Talvala2012-10-231-1/+1
| |\
| | * Camera2: Increase mode update timeout.Eino-Ville Talvala2012-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During camera startup, it might take a few hundred milliseconds before requests start to be dequeued by the HAL. Increase the timeout for synchronizing mode changes and triggers so that triggers near startup don't time out. Bug: 6970465 Change-Id: I9dc35378e8018ec18ae31be874fcb094f8a9a0e9
* | | am 3aaa4e30: am c4640c9e: Increase allowed number of VHQ resamplers to 3Glenn Kasten2012-10-231-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '3aaa4e30f7663673f3453d3f4671b1119f1802fd': Increase allowed number of VHQ resamplers to 3
| * | Increase allowed number of VHQ resamplers to 3Glenn Kasten2012-10-221-1/+1
| | | | | | | | | | | | | | | Bug: 7378660 Change-Id: I69e33ca2eb4bb9bd38e2c63df62cd1130d68baf6
* | | am 7f4d5714: am e384d75b: Merge "Fix a typo that caused the high quality ↵Mathias Agopian2012-10-221-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | resampler to produce garbage" into jb-mr1-dev * commit '7f4d5714f3f0ab4efaf2d0929a9f984467ef95c7': Fix a typo that caused the high quality resampler to produce garbage
| * | Fix a typo that caused the high quality resampler to produce garbageMathias Agopian2012-10-211-1/+1
| |/ | | | | | | | | | | | | | | | | the problem is that if libaudio_resampler is present, it is those coefficients that will always be selected, but the correct meta-data. Bug: 7385994 Change-Id: Ieebeb37b4dfb62a1a051bc29fae2ce056dbc6621
* | am e50ba28a: am 9e760d66: Merge "Camera2: Fix potential deadlock" into ↵Eino-Ville Talvala2012-10-191-7/+11
|\ \ | |/ | | | | | | | | | | jb-mr1-dev * commit 'e50ba28aa1846a7c2a296f122a5675476dacc4a5': Camera2: Fix potential deadlock
| * Merge "Camera2: Fix potential deadlock" into jb-mr1-devEino-Ville Talvala2012-10-191-7/+11
| |\
| | * Camera2: Fix potential deadlockEino-Ville Talvala2012-10-171-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setPreviewWindow was holding a lock during long-lasting HAL calls which may cause deadlock if the HAL calls back into the service during the call. Stop holding the lock during these calls, since it's not essential to do so. Bug: 7320517 Change-Id: I4a35703d751e22ac32979b5a1288e291610576e7
* | | am 424b4a57: am 291f824e: Remove active track when thread goes to standbyGlenn Kasten2012-10-191-3/+3
|\ \ \ | |/ / | | | | | | | | | * commit '424b4a57f5e1e8bd99cb619398389a467ec41f92': Remove active track when thread goes to standby
| * | Remove active track when thread goes to standbyGlenn Kasten2012-10-181-3/+3
| |/ | | | | | | | | Bug: 7369232 Change-Id: I7ff9f525dad4be0aef562a53015b06ee7d3d50f1
* | am ed653a35: am ecfbc952: Merge "Camera2: Improve quirks focusing behavior." ↵Eino-Ville Talvala2012-10-162-2/+9
|\ \ | |/ | | | | | | | | | | into jb-mr1-dev * commit 'ed653a35784969b7d36e8b36bd421e2a54def0de': Camera2: Improve quirks focusing behavior.
| * Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-devEino-Ville Talvala2012-10-162-2/+9
| |\
| | * Camera2: Improve quirks focusing behavior.Eino-Ville Talvala2012-10-162-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When scene mode is set and the AF quirk is in use, don't change AF mode and then cancel when AF cancel is received. Just change mode since that also implies a cancel. - Only trigger quirks switch when a focusing area is set. Bug: 7318812 Change-Id: I28d8755553bd78052e774701210cb94d84ee2046
* | | am aa00830e: am bbe11e46: Merge "Fix track estimation for presentation ↵Jean-Michel Trivi2012-10-161-4/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | complete" into jb-mr1-dev * commit 'aa00830e46cb7494af7217246788c1bca83b1d04': Fix track estimation for presentation complete
| * | Merge "Fix track estimation for presentation complete" into jb-mr1-devJean-Michel Trivi2012-10-161-4/+2
| |\ \ | | |/ | |/|
| | * Fix track estimation for presentation completeJean-Michel Trivi2012-10-161-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Audio tracks were not using the right latency estimation for signalling the completion of their presetation. This caused the synchronization mechanism between playback and record to be off, and a synchronized recording would contain some of the audio that was meant to be over once recording would start. Use the playback thread's latency reporting which takes the audio pipe into account. Bug 7237669 Change-Id: I23a907a53ad0b0d68d246789ec595a77a79fced5
* | | am 74a7bcc0: am 54717320: Camera2: Don\'t touch frame counter on output frames.Eino-Ville Talvala2012-10-161-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '74a7bcc052d9bdd0f555e9be6f5ecaf92c6b22d8': Camera2: Don't touch frame counter on output frames.
| * | Camera2: Don't touch frame counter on output frames.Eino-Ville Talvala2012-10-161-1/+1
| | | | | | | | | | | | | | | Bug: 7357069 Change-Id: I9cd0cdcc23959bfecced5f47bb9e8c59c997dade
* | | am 522fa119: am d6cc4a62: Camera2: When focus is already locked in CAF mode, ↵Eino-Ville Talvala2012-10-163-4/+41
|\ \ \ | |/ / | | | | | | | | | | | | | | | do not trigger HAL. * commit '522fa119fe2745cd950b6216ad6b49587372b7b3': Camera2: When focus is already locked in CAF mode, do not trigger HAL.
| * | Camera2: When focus is already locked in CAF mode, do not trigger HAL.Eino-Ville Talvala2012-10-163-4/+41
| |/ | | | | | | | | | | | | | | | | | | | | | | In HAL2 CAF modes, once focus is locked by an AF trigger, additional triggers will not cause AF notifications, since the state will not change again until a cancelAutofocus call. Since the old API still expects to see a notification, short-circuit this at the service and send an immediate success notification. Bug: 7318298 Change-Id: Ib209a24eaf2a35a247d06aea671efe80a33d751e
* | am cb3911d3: am a14be593: Camera2: Don\'t error out of startPreview when ↵Eino-Ville Talvala2012-10-101-4/+7
|\ \ | |/ | | | | | | | | | | already recording. * commit 'cb3911d30c515e06fbea0000af02fa3d09688943': Camera2: Don't error out of startPreview when already recording.
| * Camera2: Don't error out of startPreview when already recording.Eino-Ville Talvala2012-10-101-4/+7
| | | | | | | | | | Bug: 7327474 Change-Id: I603da5b8bd58e5a700d7ae0b3d34bd89bbcb1d53
* | am 0f95fadb: am 7e2c0a15: Merge "Support querying active record sources" ↵Jean-Michel Trivi2012-10-102-0/+13
|\ \ | |/ | | | | | | | | | | into jb-mr1-dev * commit '0f95fadb8a3ee402f2c51a932a06f1f685ab2d35': Support querying active record sources
| * Merge "Support querying active record sources" into jb-mr1-devJean-Michel Trivi2012-10-102-0/+13
| |\
| | * Support querying active record sourcesJean-Michel Trivi2012-10-102-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for querying whether there is currently a recording underway from the specified audio source. Bug 7314859 Change-Id: I986b231a10ffd368b08ec2f9c7f348d28eaeb892
* | | am f5230955: am 907e5651: Camera2: Don\'t let unlocks happen during recording.Eino-Ville Talvala2012-10-101-2/+6
|\ \ \ | |/ / | | | | | | | | | * commit 'f52309555013e9909b248374f96d22dae29f6454': Camera2: Don't let unlocks happen during recording.
| * | Camera2: Don't let unlocks happen during recording.Eino-Ville Talvala2012-10-101-2/+6
| | | | | | | | | | | | | | | Bug: 7309020 Change-Id: I6e66809b868d2e8f47f71e6f8752b44ec06dfb17
* | | am 6f846139: am 55f6c9df: Camera2: Do not set auto-white-balance regions ↵Eino-Ville Talvala2012-10-101-3/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | from metering regions. * commit '6f846139d97ad6cccdd2f243ccf3a19036ad12c7': Camera2: Do not set auto-white-balance regions from metering regions.
| * | Camera2: Do not set auto-white-balance regions from metering regions.Eino-Ville Talvala2012-10-101-3/+0
| | | | | | | | | | | | | | | | | | | | | Per API documentation, metering regions are only for AE, not also for AWB. Bug: 7312720 Change-Id: I39bcf33e4c81e80022f45e8fca77ea6cf9ba115e
* | | am e44d7f83: am c0379204: Camera: Limit valid caller PIDs for camera clients.Eino-Ville Talvala2012-10-102-20/+11
|\ \ \ | |/ / | | | | | | | | | * commit 'e44d7f83a4d04b90417684d74f18ad8c703b981a': Camera: Limit valid caller PIDs for camera clients.
| * | Camera: Limit valid caller PIDs for camera clients.Eino-Ville Talvala2012-10-102-20/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Narrow down on PID checks to avoid cases where service can access the camera even though it shouldn't be able to, per API semantics. Bug: 6970469 Change-Id: Ic468a31949c28ef978b6ed48a70e4601c7ced684
* | | am 4c7b3129: am 2b0db6ae: Merge "Camera: Clear Hardware device pointer when ↵Eino-Ville Talvala2012-10-101-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | initialization fails" into jb-mr1-dev * commit '4c7b312964b2430ccc1f99e99092cc870be2a293': Camera: Clear Hardware device pointer when initialization fails
| * | Merge "Camera: Clear Hardware device pointer when initialization fails" into ↵Eino-Ville Talvala2012-10-091-0/+1
| |\ \ | | |/ | |/| | | | jb-mr1-dev
| | * Camera: Clear Hardware device pointer when initialization failsIgor Murashkin2012-10-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | When disconnecting, don't try to call device functions if the initialization fails since this can lead to internal HAL segfaults. Bug: 7317107 Change-Id: Ib65db7eb6556ee10d844959934b1bfd7bb08d0ff
* | | am 754cbdd2: am dca0ac21: Merge "Camera2: Fix uninitialized parameters." ↵Eino-Ville Talvala2012-10-091-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | into jb-mr1-dev * commit '754cbdd2dd3376bb2b55d762c2909f816bd768cc': Camera2: Fix uninitialized parameters.
| * | Merge "Camera2: Fix uninitialized parameters." into jb-mr1-devEino-Ville Talvala2012-10-091-0/+8
| |\ \ | | |/ | |/|
| | * Camera2: Fix uninitialized parameters.Eino-Ville Talvala2012-10-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some parameters were not being set to default values, causing strange flakiness in any app that wasn't calling setParameters. This includes many CTS tests. Bug: 6970468 Change-Id: If91635afc000e23862e7b039292a55349274c5ee
* | | am e4664bb0: am 3d84d38e: Merge "Camera2: Call onAutoFocus immediately for ↵Igor Murashkin2012-10-091-0/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | fixed-focus cameras" into jb-mr1-dev * commit 'e4664bb098a9b7d6ae1a93486456eff71eaae1bf': Camera2: Call onAutoFocus immediately for fixed-focus cameras
| * | Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into ↵Igor Murashkin2012-10-091-0/+15
| |\ \ | | | | | | | | | | | | jb-mr1-dev
| | * | Camera2: Call onAutoFocus immediately for fixed-focus camerasIgor Murashkin2012-10-091-0/+15
| | |/ | | | | | | | | | | | | Bug: 7311578 Change-Id: Ib8a8ea1f5fc269abdd24ed1e0370dc9b87b284ee
* | | am 240a538b: am d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing ↵Eino-Ville Talvala2012-10-092-5/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | to be later." into jb-mr1-dev * commit '240a538b59b905b68d46e39d79c8d48d1662161c': Camera2: Move non-ZSL shutter sound firing to be later.
| * | Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-devEino-Ville Talvala2012-10-092-5/+12
| |\ \
| | * | Camera2: Move non-ZSL shutter sound firing to be later.Eino-Ville Talvala2012-10-082-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of firing shutter sound when capture request is submitted for non-ZSL captures, fire it when the metadata frame is received. This guarantees that the shutter sound fires after picture capture is completed by the sensor. Bug: 7259900 Change-Id: I4a1eeed89ed0400bf80b0f0cc2d5799c3d9bb9e3
* | | | am 80dfc5dc: am 350d3b68: Merge "audio policy: deprecate ↵Eric Laurent2012-10-091-4/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | ro.camera.sound.forced" into jb-mr1-dev * commit '80dfc5dc7ec6d20beb0360e8efcc5331f4d25d06': audio policy: deprecate ro.camera.sound.forced
| * | | Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-devEric Laurent2012-10-091-4/+0
| |\ \ \ | | |_|/ | |/| |
| | * | audio policy: deprecate ro.camera.sound.forcedEric Laurent2012-10-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The volume and routing policy of AUDIO_STREAM_ENFORCED_AUDIBLE is now controlled by AudioService. Do not read ro.camera.sound.forced is not needed anymore. Bug 7032634. Change-Id: Ic0a6396fc4b6efb91cdb4dffe0c8eb035d0440bd