OSDN Git Service
Eino-Ville Talvala [Thu, 11 Oct 2012 00:52:31 +0000 (17:52 -0700)]
am
cb3911d3: am
a14be593: Camera2: Don\'t error out of startPreview when already recording.
* commit '
cb3911d30c515e06fbea0000af02fa3d09688943':
Camera2: Don't error out of startPreview when already recording.
Eino-Ville Talvala [Thu, 11 Oct 2012 00:51:31 +0000 (17:51 -0700)]
am
a14be593: Camera2: Don\'t error out of startPreview when already recording.
* commit '
a14be59340219c47639ec77a352d2af362551a6f':
Camera2: Don't error out of startPreview when already recording.
Jean-Michel Trivi [Thu, 11 Oct 2012 00:23:19 +0000 (17:23 -0700)]
am
0f95fadb: am
7e2c0a15: Merge "Support querying active record sources" into jb-mr1-dev
* commit '
0f95fadb8a3ee402f2c51a932a06f1f685ab2d35':
Support querying active record sources
Eino-Ville Talvala [Thu, 11 Oct 2012 00:22:53 +0000 (17:22 -0700)]
am
f5230955: am
907e5651: Camera2: Don\'t let unlocks happen during recording.
* commit '
f52309555013e9909b248374f96d22dae29f6454':
Camera2: Don't let unlocks happen during recording.
Eino-Ville Talvala [Thu, 11 Oct 2012 00:17:01 +0000 (17:17 -0700)]
Camera2: Don't error out of startPreview when already recording.
Bug:
7327474
Change-Id: I603da5b8bd58e5a700d7ae0b3d34bd89bbcb1d53
Jean-Michel Trivi [Wed, 10 Oct 2012 23:36:04 +0000 (16:36 -0700)]
am
7e2c0a15: Merge "Support querying active record sources" into jb-mr1-dev
* commit '
7e2c0a15bb8086460070811a152029726479a297':
Support querying active record sources
Jean-Michel Trivi [Wed, 10 Oct 2012 23:30:19 +0000 (16:30 -0700)]
Merge "Support querying active record sources" into jb-mr1-dev
Eino-Ville Talvala [Wed, 10 Oct 2012 23:17:11 +0000 (16:17 -0700)]
am
907e5651: Camera2: Don\'t let unlocks happen during recording.
* commit '
907e5651c18d0e25073743a49a685fe1a385939a':
Camera2: Don't let unlocks happen during recording.
Eino-Ville Talvala [Wed, 10 Oct 2012 22:28:53 +0000 (15:28 -0700)]
Camera2: Don't let unlocks happen during recording.
Bug:
7309020
Change-Id: I6e66809b868d2e8f47f71e6f8752b44ec06dfb17
Eino-Ville Talvala [Wed, 10 Oct 2012 20:19:18 +0000 (13:19 -0700)]
am
6f846139: am
55f6c9df: Camera2: Do not set auto-white-balance regions from metering regions.
* commit '
6f846139d97ad6cccdd2f243ccf3a19036ad12c7':
Camera2: Do not set auto-white-balance regions from metering regions.
Eino-Ville Talvala [Wed, 10 Oct 2012 20:17:01 +0000 (13:17 -0700)]
am
55f6c9df: Camera2: Do not set auto-white-balance regions from metering regions.
* commit '
55f6c9dfd713776e251655b3ddd496b17df0926e':
Camera2: Do not set auto-white-balance regions from metering regions.
Eino-Ville Talvala [Wed, 10 Oct 2012 20:07:01 +0000 (13:07 -0700)]
am
e44d7f83: am
c0379204: Camera: Limit valid caller PIDs for camera clients.
* commit '
e44d7f83a4d04b90417684d74f18ad8c703b981a':
Camera: Limit valid caller PIDs for camera clients.
Eino-Ville Talvala [Wed, 10 Oct 2012 20:05:48 +0000 (13:05 -0700)]
am
c0379204: Camera: Limit valid caller PIDs for camera clients.
* commit '
c03792041b9dd6f7f54abd6c82bd6c755a336cd8':
Camera: Limit valid caller PIDs for camera clients.
Eino-Ville Talvala [Tue, 9 Oct 2012 06:58:02 +0000 (23:58 -0700)]
Camera2: Do not set auto-white-balance regions from metering regions.
Per API documentation, metering regions are only for AE, not also for AWB.
Bug:
7312720
Change-Id: I39bcf33e4c81e80022f45e8fca77ea6cf9ba115e
Jean-Michel Trivi [Wed, 10 Oct 2012 19:11:16 +0000 (12:11 -0700)]
Support querying active record sources
Add support for querying whether there is currently a recording
underway from the specified audio source.
Bug
7314859
Change-Id: I986b231a10ffd368b08ec2f9c7f348d28eaeb892
The Android Open Source Project [Wed, 10 Oct 2012 16:47:53 +0000 (09:47 -0700)]
am
6c839563: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
6c8395633d4ed9f88888e6df0ae2f33fd8401fd0':
The Android Open Source Project [Wed, 10 Oct 2012 16:44:29 +0000 (09:44 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I0a56a7cd77b8d52e699455b6bd01b884bcc32bc4
Eino-Ville Talvala [Wed, 10 Oct 2012 05:16:58 +0000 (22:16 -0700)]
Camera: Limit valid caller PIDs for camera clients.
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
The Android Automerger [Wed, 10 Oct 2012 15:50:21 +0000 (08:50 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Wed, 10 Oct 2012 15:39:58 +0000 (08:39 -0700)]
am
4c7b3129: am
2b0db6ae: Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev
* commit '
4c7b312964b2430ccc1f99e99092cc870be2a293':
Camera: Clear Hardware device pointer when initialization fails
Eino-Ville Talvala [Wed, 10 Oct 2012 15:37:33 +0000 (08:37 -0700)]
am
2b0db6ae: Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev
* commit '
2b0db6aea3be519334f340ca97581db902196690':
Camera: Clear Hardware device pointer when initialization fails
The Android Automerger [Wed, 10 Oct 2012 13:59:19 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Wed, 10 Oct 2012 04:57:37 +0000 (21:57 -0700)]
Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev
Andreas Huber [Tue, 9 Oct 2012 23:18:17 +0000 (16:18 -0700)]
am
1f9300d9: am
73125afc: Merge "Switch audio mode based on dongle\'s capabilities" into jb-mr1-dev
* commit '
1f9300d9f0050b972ee6dd6c39b362baf8528a38':
Switch audio mode based on dongle's capabilities
Andreas Huber [Tue, 9 Oct 2012 23:16:15 +0000 (16:16 -0700)]
am
73125afc: Merge "Switch audio mode based on dongle\'s capabilities" into jb-mr1-dev
* commit '
73125afc0333c9aba37749e605537342caca11cd':
Switch audio mode based on dongle's capabilities
Andreas Huber [Tue, 9 Oct 2012 23:11:27 +0000 (16:11 -0700)]
Merge "Switch audio mode based on dongle's capabilities" into jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 23:07:19 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Tue, 9 Oct 2012 22:53:34 +0000 (15:53 -0700)]
Switch audio mode based on dongle's capabilities
properly parse rtp port and use it to setup session.
Change-Id: Ic7521cb867143278196c3ce4b19a74ecc2703d8e
related-to-bug:
7318719
The Android Automerger [Tue, 9 Oct 2012 22:38:51 +0000 (15:38 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 22:30:44 +0000 (15:30 -0700)]
am
754cbdd2: am
dca0ac21: Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev
* commit '
754cbdd2dd3376bb2b55d762c2909f816bd768cc':
Camera2: Fix uninitialized parameters.
Eino-Ville Talvala [Tue, 9 Oct 2012 22:28:00 +0000 (15:28 -0700)]
am
dca0ac21: Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev
* commit '
dca0ac2193e87c57d871dd208073107408c13c0a':
Camera2: Fix uninitialized parameters.
Eino-Ville Talvala [Tue, 9 Oct 2012 22:22:46 +0000 (15:22 -0700)]
Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev
Igor Murashkin [Tue, 9 Oct 2012 21:45:37 +0000 (14:45 -0700)]
Camera: Clear Hardware device pointer when initialization fails
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
Igor Murashkin [Tue, 9 Oct 2012 20:54:40 +0000 (13:54 -0700)]
am
e4664bb0: am
3d84d38e: Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev
* commit '
e4664bb098a9b7d6ae1a93486456eff71eaae1bf':
Camera2: Call onAutoFocus immediately for fixed-focus cameras
Igor Murashkin [Tue, 9 Oct 2012 20:53:17 +0000 (13:53 -0700)]
am
3d84d38e: Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev
* commit '
3d84d38e7ac02b47d17f4bb272f18f8b0e873104':
Camera2: Call onAutoFocus immediately for fixed-focus cameras
Igor Murashkin [Tue, 9 Oct 2012 20:49:28 +0000 (13:49 -0700)]
Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 19:52:16 +0000 (12:52 -0700)]
Camera2: Fix uninitialized parameters.
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
Eino-Ville Talvala [Tue, 9 Oct 2012 19:17:38 +0000 (12:17 -0700)]
am
240a538b: am
d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev
* commit '
240a538b59b905b68d46e39d79c8d48d1662161c':
Camera2: Move non-ZSL shutter sound firing to be later.
Eino-Ville Talvala [Tue, 9 Oct 2012 19:15:58 +0000 (12:15 -0700)]
am
d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev
* commit '
d016cf5b12cb73bd49bcecb0d5a4958df23620c3':
Camera2: Move non-ZSL shutter sound firing to be later.
Eino-Ville Talvala [Tue, 9 Oct 2012 19:12:07 +0000 (12:12 -0700)]
Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev
Eric Laurent [Tue, 9 Oct 2012 18:34:32 +0000 (11:34 -0700)]
am
80dfc5dc: am
350d3b68: Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev
* commit '
80dfc5dc7ec6d20beb0360e8efcc5331f4d25d06':
audio policy: deprecate ro.camera.sound.forced
Eric Laurent [Tue, 9 Oct 2012 18:32:31 +0000 (11:32 -0700)]
am
350d3b68: Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev
* commit '
350d3b686357a159fb1a962bbd41e01924d27cad':
audio policy: deprecate ro.camera.sound.forced
Eric Laurent [Tue, 9 Oct 2012 18:28:53 +0000 (11:28 -0700)]
Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev
Igor Murashkin [Tue, 9 Oct 2012 01:05:12 +0000 (18:05 -0700)]
Camera2: Call onAutoFocus immediately for fixed-focus cameras
Bug:
7311578
Change-Id: Ib8a8ea1f5fc269abdd24ed1e0370dc9b87b284ee
The Android Open Source Project [Tue, 9 Oct 2012 14:31:59 +0000 (07:31 -0700)]
am
df81a1aa: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
df81a1aa1e89da71f02307f7eddb3d1ca5ee4a55':
Camera2: Don't promote weak IBinder ptrs to strong ones
The Android Open Source Project [Tue, 9 Oct 2012 14:29:10 +0000 (07:29 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I2d81c143dd737e9faf93df9a104d79f7f36fd429
The Android Automerger [Tue, 9 Oct 2012 13:59:19 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 05:25:29 +0000 (22:25 -0700)]
am
843aba43: am
2458d482: Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev
* commit '
843aba43ef85f5a40db03e0f384ed096b03592d0':
Camera2: Always disconnect in the client destructor
Eino-Ville Talvala [Tue, 9 Oct 2012 05:23:37 +0000 (22:23 -0700)]
am
2458d482: Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev
* commit '
2458d482c4822c6f9e6274f5bd12b6aea095a9cd':
Camera2: Always disconnect in the client destructor
Eino-Ville Talvala [Tue, 9 Oct 2012 05:20:47 +0000 (22:20 -0700)]
Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev
Eino-Ville Talvala [Mon, 8 Oct 2012 05:43:48 +0000 (22:43 -0700)]
Camera2: Move non-ZSL shutter sound firing to be later.
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
Igor Murashkin [Mon, 8 Oct 2012 23:22:39 +0000 (16:22 -0700)]
am
4a4253b9: am
82edd543: Camera2: isSmoothZoomSupported should return FALSE
* commit '
4a4253b979586c9de21425f5e3cb34da9f1e57de':
Camera2: isSmoothZoomSupported should return FALSE
Alex Ray [Mon, 8 Oct 2012 23:21:43 +0000 (16:21 -0700)]
am
9ea63b3b: am
6f854608: Camera2: Set default flash mode to FLASH_OFF
* commit '
9ea63b3bfd696bcce9cb28e86218a3449dd699d8':
Camera2: Set default flash mode to FLASH_OFF
Eric Laurent [Mon, 8 Oct 2012 23:00:36 +0000 (16:00 -0700)]
audio policy: deprecate ro.camera.sound.forced
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
Igor Murashkin [Mon, 8 Oct 2012 22:32:09 +0000 (15:32 -0700)]
am
82edd543: Camera2: isSmoothZoomSupported should return FALSE
* commit '
82edd5431951f461058c07b73c0dbc093aa45c99':
Camera2: isSmoothZoomSupported should return FALSE
Igor Murashkin [Mon, 8 Oct 2012 22:09:46 +0000 (15:09 -0700)]
Camera2: Always disconnect in the client destructor
If Camera2Client failed to initialize, it would skip disconnect step,
and thus the camera would be forever marked as busy. By always calling
disconnect it will always call free.
It also adds a new guarantee that Client::disconnect is idempotent
Bug:
7298182
Change-Id: Ic9876f1665b7d9b3c0da692880f63f165e3f4fa5
Igor Murashkin [Mon, 8 Oct 2012 21:08:32 +0000 (14:08 -0700)]
Camera2: isSmoothZoomSupported should return FALSE
Bug:
7308024
Change-Id: Ib757bef8f6dc203f8dfa6ea6d11191e3c7cfcc6d
Alex Ray [Mon, 8 Oct 2012 21:13:04 +0000 (14:13 -0700)]
am
6f854608: Camera2: Set default flash mode to FLASH_OFF
* commit '
6f854608d26d7abcce5e46396c7260ed7b250653':
Camera2: Set default flash mode to FLASH_OFF
Alex Ray [Mon, 8 Oct 2012 19:04:15 +0000 (12:04 -0700)]
Camera2: Set default flash mode to FLASH_OFF
Bug:
6970090
Change-Id: I904b1be2ee0710e82e8e647753a705184c10b46c
Igor Murashkin [Mon, 8 Oct 2012 20:15:44 +0000 (13:15 -0700)]
am
a761686d: am
4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev
* commit '
a761686d14ff8abd704a4802ca6ea0b801a9a32d':
Camera2: Fix Parameters#setZoom off by 1 validation error
Igor Murashkin [Mon, 8 Oct 2012 20:14:25 +0000 (13:14 -0700)]
am
4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev
* commit '
4c9aeb21051e908b0a0a0864a04a96a4109717a1':
Camera2: Fix Parameters#setZoom off by 1 validation error
Igor Murashkin [Mon, 8 Oct 2012 20:10:48 +0000 (13:10 -0700)]
Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev
Eino-Ville Talvala [Mon, 8 Oct 2012 19:23:34 +0000 (12:23 -0700)]
am
c7ee4fda: am
b8f0090a: Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev
* commit '
c7ee4fda96539815e877cf035c9984f6009c4875':
Camera2: On stopping preview, wait until captures are completed.
Eino-Ville Talvala [Mon, 8 Oct 2012 19:22:05 +0000 (12:22 -0700)]
am
b8f0090a: Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev
* commit '
b8f0090af19b95027d2e08667c662d058832f94b':
Camera2: On stopping preview, wait until captures are completed.
Eino-Ville Talvala [Mon, 8 Oct 2012 19:17:36 +0000 (12:17 -0700)]
Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev
Igor Murashkin [Mon, 8 Oct 2012 18:16:03 +0000 (11:16 -0700)]
Camera2: Fix Parameters#setZoom off by 1 validation error
Bug:
7298683
Change-Id: If79ac6396379593eb852f041ca7d5a20ad2f9e6d
Igor Murashkin [Mon, 8 Oct 2012 17:57:20 +0000 (10:57 -0700)]
am
97f00a6b: am
e18c1cce: Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev
* commit '
97f00a6b6cde4837e0ab3751d7cfd2921c11f9b4':
Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras
Igor Murashkin [Mon, 8 Oct 2012 17:26:36 +0000 (10:26 -0700)]
am
e18c1cce: Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev
* commit '
e18c1cce29dde2054ce52b9135b152901883ca91':
Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras
Igor Murashkin [Mon, 8 Oct 2012 17:23:06 +0000 (10:23 -0700)]
Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev
ty.lee [Mon, 8 Oct 2012 06:43:45 +0000 (23:43 -0700)]
am
6f45866e: am
c8823995: audioflinger/resampler: add build source for libaudio-resampler
* commit '
6f45866e8a942b2a8a21c75708a717b0c8a8f120':
audioflinger/resampler: add build source for libaudio-resampler
ty.lee [Mon, 8 Oct 2012 06:40:28 +0000 (23:40 -0700)]
am
c8823995: audioflinger/resampler: add build source for libaudio-resampler
* commit '
c8823995d16b909fae30ff4f94217e875d3e8c8a':
audioflinger/resampler: add build source for libaudio-resampler
Eino-Ville Talvala [Fri, 5 Oct 2012 19:03:10 +0000 (12:03 -0700)]
Camera2: On stopping preview, wait until captures are completed.
If preview is stopped while a still capture or a video snapshot is
underway, wait until the capture completes before stopping preview.
Also use the same behavior for disconnect - do not shut down the
camera device until captures are complete.
This works around HAL implementations which report to be done
(get_in_progress_count returns 0) even when a capture is still
outstanding.
Bug:
7276954
Change-Id: I66290acf1740cc330eadecbcded0c59fa9c5d2fd
The Android Automerger [Mon, 8 Oct 2012 01:57:53 +0000 (18:57 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
ty.lee [Mon, 1 Oct 2012 04:54:14 +0000 (13:54 +0900)]
audioflinger/resampler: add build source for libaudio-resampler
Bug:
7229644
Change-Id: I93bde36be1c3ec84174a4c98423e28f8b3d8782f
Signed-off-by: ty.lee <ty.lee@lge.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Eino-Ville Talvala [Sun, 7 Oct 2012 16:10:36 +0000 (09:10 -0700)]
am
3576742a: am
4d410ede: Camera2: Fix off-by-one error in ZSL selection.
* commit '
3576742a2bb3dc10bf8256579d600d85f17c3835':
Camera2: Fix off-by-one error in ZSL selection.
Eino-Ville Talvala [Sun, 7 Oct 2012 16:07:13 +0000 (09:07 -0700)]
am
4d410ede: Camera2: Fix off-by-one error in ZSL selection.
* commit '
4d410ede659448557398c84552eb0bf50ef09cbc':
Camera2: Fix off-by-one error in ZSL selection.
The Android Automerger [Sun, 7 Oct 2012 13:59:17 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Sat, 6 Oct 2012 20:50:31 +0000 (13:50 -0700)]
Camera2: Fix off-by-one error in ZSL selection.
Bug:
7258126
Change-Id: Ie6da4645c46a7bb0dbd11d7c6183e904f41f74fd
Eino-Ville Talvala [Sat, 6 Oct 2012 04:50:38 +0000 (21:50 -0700)]
am
4d85afad: am
f6e09d20: Camera2: Unconditionally shut down streams on disconnect.
* commit '
4d85afad335ded1019ec7697b9f37241a839efa1':
Camera2: Unconditionally shut down streams on disconnect.
Eino-Ville Talvala [Sat, 6 Oct 2012 04:48:30 +0000 (21:48 -0700)]
am
f6e09d20: Camera2: Unconditionally shut down streams on disconnect.
* commit '
f6e09d200c3e043737adcdadd52310ebbd1b19da':
Camera2: Unconditionally shut down streams on disconnect.
Igor Murashkin [Sat, 6 Oct 2012 00:09:09 +0000 (17:09 -0700)]
Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras
Bug:
7298805
Change-Id: I7499b80a9416bf454c8ea80c31ea4fdd3c4ee2d7
Eino-Ville Talvala [Fri, 5 Oct 2012 00:01:25 +0000 (17:01 -0700)]
Camera2: Unconditionally shut down streams on disconnect.
stopPreviewL may do nothing in certain states. Stop streams directly
to avoid those failures, so that we always maintain the HAL interface
invariant that streams referenced by in-flight requests are never
deleted.
Bug:
7276954
Change-Id: Ic4cffc43036f4944684d941981a43d6dd1dce7af
Igor Murashkin [Fri, 5 Oct 2012 20:56:41 +0000 (13:56 -0700)]
am
de434d89: am
7373cbe8: Camera2: Fix metering regions to take into account the current zoom/crop region
* commit '
de434d8969bd02ffd7cdfdd39577dd59f6a71e9d':
Camera2: Fix metering regions to take into account the current zoom/crop region
Igor Murashkin [Fri, 5 Oct 2012 20:54:51 +0000 (13:54 -0700)]
am
7373cbe8: Camera2: Fix metering regions to take into account the current zoom/crop region
* commit '
7373cbe85e617345f7002256a4be389fe62af913':
Camera2: Fix metering regions to take into account the current zoom/crop region
Igor Murashkin [Fri, 28 Sep 2012 22:30:03 +0000 (15:30 -0700)]
Camera2: Fix metering regions to take into account the current zoom/crop region
Also adds a quirk to disable this fix to work around for incompliant HALs
Bug:
7246065
Change-Id: I80bad25e56ba59149270238e5639bb33cae495ae
Igor Murashkin [Fri, 5 Oct 2012 17:44:57 +0000 (10:44 -0700)]
Camera2: Don't promote weak IBinder ptrs to strong ones
The Binder driver does not support promoting weak pointers into strong
pointers. Occassionally the system would lock up when trying to do this
(when closing the camera app).
Bug:
7289040
Change-Id: I8bc0b5c48616bf0b7f4eed1878ad4994ee635871
Igor Murashkin [Fri, 5 Oct 2012 19:17:02 +0000 (12:17 -0700)]
am
9be4d65d: am
af3d2887: Camera2: Change policy for calculating previewFpsRange from previewFps
* commit '
9be4d65d73bb8db98bf1f53e8c47ff3e3546a144':
Camera2: Change policy for calculating previewFpsRange from previewFps
Igor Murashkin [Fri, 5 Oct 2012 19:14:12 +0000 (12:14 -0700)]
am
af3d2887: Camera2: Change policy for calculating previewFpsRange from previewFps
* commit '
af3d28870f7890370d6acb21d20cf1ccab4b9e08':
Camera2: Change policy for calculating previewFpsRange from previewFps
Igor Murashkin [Thu, 4 Oct 2012 21:22:18 +0000 (14:22 -0700)]
Camera2: Change policy for calculating previewFpsRange from previewFps
Bug:
7259959
Change-Id: I759a559d7115201264f88db1f23edc2d6aef6c43
Igor Murashkin [Fri, 5 Oct 2012 18:42:44 +0000 (11:42 -0700)]
am
7ca6460d: am
becb0bc4: Merge "Camera2: Don\'t promote weak IBinder ptrs to strong ones" into jb-mr1-dev
* commit '
7ca6460d06144d76460c8d43128bd338839d9501':
Camera2: Don't promote weak IBinder ptrs to strong ones
Igor Murashkin [Fri, 5 Oct 2012 18:41:07 +0000 (11:41 -0700)]
am
becb0bc4: Merge "Camera2: Don\'t promote weak IBinder ptrs to strong ones" into jb-mr1-dev
* commit '
becb0bc4b620dcd88b559d821e40a9ca7ced5604':
Camera2: Don't promote weak IBinder ptrs to strong ones
Igor Murashkin [Fri, 5 Oct 2012 18:35:53 +0000 (11:35 -0700)]
Merge "Camera2: Don't promote weak IBinder ptrs to strong ones" into jb-mr1-dev
Eino-Ville Talvala [Fri, 5 Oct 2012 18:24:09 +0000 (11:24 -0700)]
am
e5f4024b: am
95069fef: Camera2: Use the triggerAfWithAuto quirk
* commit '
e5f4024bad9875e96cefbe3fe81172d166d52154':
Camera2: Use the triggerAfWithAuto quirk
Eino-Ville Talvala [Fri, 5 Oct 2012 18:24:08 +0000 (11:24 -0700)]
am
577ac8a7: am
4865c526: Camera2: Synchronize mode changes and triggers
* commit '
577ac8a74e8af7fcc7bc714874b8da21f57989b5':
Camera2: Synchronize mode changes and triggers
Eino-Ville Talvala [Fri, 5 Oct 2012 18:22:13 +0000 (11:22 -0700)]
am
95069fef: Camera2: Use the triggerAfWithAuto quirk
* commit '
95069fefbdf54d87a624c2ac73727fce1c38545e':
Camera2: Use the triggerAfWithAuto quirk
Eino-Ville Talvala [Fri, 5 Oct 2012 18:22:12 +0000 (11:22 -0700)]
am
4865c526: Camera2: Synchronize mode changes and triggers
* commit '
4865c526e681366481b0ab242ffa1ead57bb02cc':
Camera2: Synchronize mode changes and triggers
Igor Murashkin [Fri, 5 Oct 2012 17:44:57 +0000 (10:44 -0700)]
Camera2: Don't promote weak IBinder ptrs to strong ones
The Binder driver does not support promoting weak pointers into strong
pointers. Occassionally the system would lock up when trying to do this
(when closing the camera app).
Bug:
7289040
Change-Id: I8bc0b5c48616bf0b7f4eed1878ad4994ee635871
The Android Open Source Project [Fri, 5 Oct 2012 15:20:39 +0000 (08:20 -0700)]
am
6c9282d3: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
6c9282d3bb5082266cfd9042f62ceea131e5b849':
Camera2: Fix deadlock while zooming during record
The Android Open Source Project [Fri, 5 Oct 2012 15:16:37 +0000 (08:16 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I9545f52b76d36bfbdf29cd270d0af200cb2d51fe
The Android Automerger [Fri, 5 Oct 2012 13:59:26 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
OSDN Git Service
