Commit Graph

1587 Commits

Author SHA1 Message Date
Ruben Brunk
a39fcc5875 Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev 2015-06-23 23:33:22 +00:00
Ruben Brunk
b8f4c6ab1e Update DngCreator to handle pre-correction dimens.
Bug: 20491394
Change-Id: I0cdf7cec104bcb5683139c81fc52c8a0a7d2365c
2015-06-23 16:23:03 -07:00
Zhijun He
3c1ff68d69 Camera2: update high speed recording API java doc
Bug: 21442271
Change-Id: Iff5889394f7723eb0fd7319b9513cd0dca04b927
2015-06-23 11:06:01 -07:00
Yin-Chia Yeh
d772b5e363 Merge "Camera: document expected thumbnail size in capture result" into mnc-dev 2015-06-23 17:12:42 +00:00
Yin-Chia Yeh
5988311cbb Camera: document expected thumbnail size in capture result
Codegen document update only.

Bug: 21880406
Change-Id: I058f6af62ff341943f7fdf6eefe8303431211970
2015-06-23 10:11:57 -07:00
Eino-Ville Talvala
e365120aae Camera2: Fix StreamConfigurationMap#isOutputSupportedFor for depth
Need to check the right configuration list if the format is a
depth format.

Also refactor code slightly to use SurfaceUtils when possible.

Bug: 21902551
Change-Id: Icca2e81d8144bede46ad9f117d5e010ed409887c
2015-06-22 14:21:22 -07:00
Eino-Ville Talvala
0819c75680 Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements
- Reword requirements for FULL level
- Remove HIGH_RESOLUTION level
- Add StreamConfigurationMap#getHighResolutionOutputSizes
- Clean up StreamConfigurationMap implementation
- Add 5-argument HashCodeHelper

Bug: 20945581
Change-Id: I75ad4b23e902192c96ed501e10c7d55fc0ad72a6
2015-06-22 14:21:22 -07:00
Chien-Yu Chen
be2e38e01c Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev 2015-06-19 19:51:42 +00:00
Zhijun He
ee2ebdedcc Camera2: add FACE_PRIORITY_LOW_LIGHT
Add FACE_PRIORITY_LOW_LIGHT to allow higher sensitivity value AE under low
light.

Also fix some minor doc issue for high speed recording capability.

Bug: 21813977
Change-Id: I965ece936c1bc3d3cb370454e950fde4aad06335
2015-06-19 09:13:37 -07:00
Eino-Ville Talvala
b7bbd629eb Merge "Camera2: Do not throw unexpected runtime exception to app" into mnc-dev 2015-06-17 18:31:45 +00:00
Eino-Ville Talvala
d3e39d16cb Camera2: Do not throw unexpected runtime exception to app
Use a generic CameraAccessException DEVICE_ERROR exception instead

Bug: 21869917
Change-Id: I73581b817cbdcbb4b876c234f050f725a459a29b
2015-06-17 11:18:43 -07:00
Chien-Yu Chen
0782aab077 ImageReader: Fix format workarounds for legacy devices
Legacy shim overrides HAL_PIXEL_FORMAT_BLOB to
HAL_PIXEL_FORMAT_RGBA_8888. Make ImageReader aware of the
workaround when returning the format.

Remove the workaround in legacy shim that overrides YUV_420_888
to YV12 because allocating YUV_420_888 buffers with SW access
is supported on Flo.

Bug: 21707937
Change-Id: I84a8610c82ae986a0064873f611e4f257baf1774
2015-06-17 11:03:04 -07:00
Chien-Yu Chen
563d60e03f Merge "Camera2: Handle getting input surface failures" into mnc-dev 2015-06-17 18:02:31 +00:00
Zhijun He
0f70c41551 Merge "Camera2: fix high speed request builder creation issue" into mnc-dev 2015-06-17 18:00:17 +00:00
Zhijun He
a002fb4df4 Camera2: fix high speed request builder creation issue
The metadata local copy was mutated (swapped) to an empty copy after use,
we need make a copy every time.

Bug: 21442271
Change-Id: I8a71663ba964288bdd1d7f50b42db762d28d89c0
2015-06-17 09:23:22 -07:00
Chien-Yu Chen
c58a602a2f Camera2: Handle getting input surface failures
Don't get the input surface after creating a session failed. Catch
the CameraRuntimeException when getting the input surface so
onConfigureFailed will be fired.

Bug: 20945169
Change-Id: Iea6891c2a1d7419d7d6669a17114f949c03a0319
2015-06-16 12:07:57 -07:00
Eino-Ville Talvala
b8bd8ab184 Camera: Adjust intrinsic transform coordinate system.
Needs to be in the pre-correction active array coordinates
for consistency.

Bug: 20491394
Change-Id: I7a28499fec59219a0f8d85c1fc37867aed90f4c0
2015-06-16 11:45:33 -07:00
Ruben Brunk
9a2da54e3c Merge "Add metadata for pre-distortion dimensions." into mnc-dev 2015-06-16 01:12:58 +00:00
Ruben Brunk
224eb3a4f1 Add metadata for pre-distortion dimensions.
Bug: 20491394
Change-Id: I6b95a7fe2fd765571bcd2774aee486d18169a727
2015-06-15 18:09:33 -07:00
Zhijun He
fa4b7fb856 Merge "Camera2: fix Surface cast issue" into mnc-dev 2015-06-15 22:58:50 +00:00
Ruben Brunk
02cd8cbc9d Add addional scale component for radialDistortion.
Bug: 20491394
Change-Id: Ibbaf8bbfe60e1e0c17ac5ba8c641b8616b1148b7
2015-06-15 15:33:09 -07:00
Zhijun He
42499640cc Camera2: fix Surface cast issue
Can not cast an object array directly to a Surface array.

Change-Id: Ie2cb711f9e1ff0fc17d6038992dc3c7af9471ccf
2015-06-15 09:43:55 -07:00
Ruben Brunk
8491d2dea9 Merge "Fix rounding width." into mnc-dev 2015-06-12 23:34:51 +00:00
Ruben Brunk
68e4fc8ca9 Fix rounding width.
Bug: 19930700
Change-Id: Ia2a1f85325e2c82e4d1ebe56aae696a207287cb7
2015-06-12 16:16:42 -07:00
Ruben Brunk
e36829ee00 Merge "Fix legacy disconnect callback." into mnc-dev 2015-06-12 22:21:54 +00:00
Ruben Brunk
b44864e76b Fix legacy disconnect callback.
Bug: 21708377
Change-Id: I17e9fe0fda77e8f4cb00578d5d9658dc24cab543
2015-06-12 14:39:12 -07:00
Ruben Brunk
25f3a7d19b Merge "Make CameraDeviceImpl#close() idempotent (for real)." into mnc-dev 2015-06-12 00:25:48 +00:00
Ruben Brunk
0953b6461a Make CameraDeviceImpl#close() idempotent (for real).
- Also fixes onClosed() implementation in CameraDeviceImpl;
  this would never return true previously.

Bug: 21698939
Change-Id: I4dd56a1410b9fc64152acc5296514f5841794fa9
2015-06-11 16:12:35 -07:00
Ruben Brunk
dcb9e169d7 Merge "Set scaling mode for legacy device surfaces." into mnc-dev 2015-06-11 22:15:58 +00:00
Ruben Brunk
a94c603345 Set scaling mode for legacy device surfaces.
Bug: 19371754
Change-Id: I0dd762e7b1485ba2d3bec9604407125c35ad1218
2015-06-11 15:15:17 -07:00
Ruben Brunk
c2b409267e Merge "Fix intermediate preview size selection for legacy." into mnc-dev 2015-06-11 20:29:28 +00:00
Yin-Chia Yeh
dba1cf3d51 Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev 2015-06-11 20:29:28 +00:00
Yin-Chia Yeh
ec743ee9a4 Camera2: Legacy: handle FPS range properly
Convert between the FPS range unit of API1 and API2.

Bug: 21754853
Change-Id: I823e533eeac3bf8beb7b975fe296b309300e2b05
2015-06-11 12:57:49 -07:00
Ruben Brunk
c64e80ddda Fix intermediate preview size selection for legacy.
Bug: 19606058
Change-Id: I4bf4c5bafdd5a50e46aa117b76d96381a3b82e5d
2015-06-10 17:38:43 -07:00
Aravind Akella
0d07846f0f Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev 2015-06-10 22:56:33 +00:00
Zhijun He
1527edbcf9 Merge "Camera2: fix high speed output surface format check" into mnc-dev 2015-06-10 22:56:22 +00:00
Aravind Akella
1b41cc9567 Use LOCATION_HARDWARE permission for data injection.
Change-Id: I59c1e1e97a6a0457f6fc2984b214647814895cf2
2015-06-10 15:21:03 -07:00
Zhijun He
47ac34997b Camera2: fix high speed output surface format check
Preview surface default format is not ImageFormat.PRIVATE, the check need to
take this into consideration.

Change-Id: Ib99e64f7781dd15cc5634c66b2d5e5ab2a2d7d6c
2015-06-10 14:41:57 -07:00
Nick Kralevich
5ac4a5fa38 Merge "Fix USB access control when adb is disabled." into mnc-dev 2015-06-10 21:11:38 +00:00
Chien-Yu Chen
a3a0ea3b1b Merge "Camera2: Clarify capture order for reprocess" into mnc-dev 2015-06-10 17:51:18 +00:00
Nick Kralevich
674019065b Fix USB access control when adb is disabled.
When adb is disabled, the default usb mode would be "none", which
would turn off the driver and prevent UsbDeviceManager from receiving
any new USB connect / disconnect messages. This prevents the user
from ever enabling MTP and sharing data when adb is turned off.

As discussed in bug 21429947, we work around this problem by keeping
the USB driver in MTP mode most of the time, so that we continue to
receive USB connect / disconnect messages.

To avoid leaking confidential user photos, this change introduces an
unlocked state. Setting the mtp enabled function is now decoupled from
exposing data on the USB connection. Only if MTP is enabled and
USB data has been unlocked is confidential user data allowed to be
shared.

Bug: 21429947
Change-Id: Iefb5c7e22dc4962bf5226f2ed3d0155b5c7b413c
2015-06-10 10:29:48 -07:00
Chien-Yu Chen
bf2d55b2b5 Camera2: Clarify capture order for reprocess
Clarify the order of regular and reprocess requests in capture()
and captureBurst().

Bug: 21558022
Change-Id: I6bc3eda9614e43a954540ad271b4145a4dbcc8f2
2015-06-09 18:09:11 -07:00
Jim Miller
e4c58e4641 Add documentation for possible AndroidKeyStore exceptions to authenticate() call
Fixes bug 20864436

Change-Id: Ic3f7406a8a6f41283ccd63018787a20353510024
2015-06-09 15:26:43 -07:00
Jim Miller
f501b58de8 Update and cleanup FingerprintManager API to new spec
Fixes bug 21040383

Change-Id: Ib97d486535869814d5b449cccb31670e8f412552
2015-06-08 16:36:29 -07:00
Wale Ogunwale
d8b9b642fe Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 2015-06-08 20:17:23 +00:00
Wale Ogunwale
26698514fb Use DisplayAdjustments when creating display in ResourceManager
We were previous only taking the Configuration into account when
creating Display objects in the ResourceManager. This led to the
Display object not containing critical CompatibilityInfo. We now
take the entire DisplayAdjustment into account.

Bug: 21637615
Change-Id: Ide5ff49bfa12791ad17993764f312836216b1dd8
2015-06-06 11:26:33 -07:00
Eino-Ville Talvala
76233f068b Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 2015-06-06 00:40:16 +00:00
Zhijun He
d24e49bba8 Camera2: add missing HFR implementation
Bug: 21442271
Change-Id: I08c0a5b75ccb0f737013026511cfe3bf9e15c744
2015-06-05 14:55:04 -07:00
Zhijun He
16ed7e70c8 Merge "Camera2: fix doc build" into mnc-dev 2015-06-05 03:33:59 +00:00
Zhijun He
39d1461cf1 Camera2: fix doc build
Bug: 21645842
Change-Id: Ibd4ce455d9906da858b98f17fd7859016c1730c3
2015-06-04 20:21:23 -07:00