Commit Graph

1624 Commits

Author SHA1 Message Date
Chien-Yu Chen
6eec00ecf4 Merge "Camera: Reconnect after camera service crashes" into mnc-dev 2015-07-14 20:48:56 +00:00
Chien-Yu Chen
0f69b4655f Camera: Reconnect after camera service crashes
Schedule a reconnection after camera service crashes if any client
registered a camera availability callback or torch status callback.

Bug: 407755
Change-Id: Iabe0bf713863898ca468cff59d4c97c66a802630
2015-07-13 17:46:04 -07:00
Aravind Akella
37511e35ae Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev 2015-07-13 18:21:37 +00:00
Aravind Akella
11fce8e8c5 Log full class name of the client activating sensors for better debugging.
Bug: 22076400
Change-Id: Ibb8e72cfb031651e803f2eaf4b6530f809c00b6b
2015-07-12 11:56:25 -07:00
Zhijun He
4fb81253ed Camera metadata: fix typos.
Bug: 22417740
Change-Id: I871b990da43132f4967faf7ee23a9a2d962c4320
2015-07-11 20:03:52 -07:00
Eino-Ville Talvala
639fffee62 Camera2: Reorganize high-speed recording API slightly
- Split off distinct high speed capture session class from base capture session
- Move createHighSpeedRequestList to CameraConstrainedHighSpeedCaptureSession

Bug: 21664295
Change-Id: I67d705fdeee1eaa6e5e3e1416771d5d0df642843
2015-07-10 00:56:18 +00:00
Jeff Brown
c1aebfa02c Merge "Clean up USB Manager and fix ADB." into mnc-dev 2015-07-09 20:03:29 +00:00
Jeff Brown
460a146eb8 Clean up USB Manager and fix ADB.
Moved functions which parse the USB functions list into one common
place on UsbManager.

Deleted the no longer supported USB_FUNCTION_MASS_STORAGE.

Ensured that the UserManager.DISALLOW_USB_FILE_TRANSFER rule is
consistently applied during user switch and when changing the
current USB functions and make sure it only affects MTP and PTP.

Collapsed the boot completed and user switched receivers to
ensure consistent ordering of side-effects.

Validate the list of functions passed to setCurrentFunction() so
that the separation of concerns is clearer.  It was somewhat
ambiguous as to whether functions such as ADB could / should be
enabled through that interface.  Improved the docs for clarity.

Fixed a bunch of broken stuff related to the USB config
persistent property (list of default functions) that could cause
ADB and other functions to not work at all.  Added new failsafes
to ensure that we reliably get back into a happy state.

Bug: 22206076
Change-Id: I02915ddfce7193a8f67a14f0d76bab22fc575dfa
2015-07-09 12:55:56 -07:00
Jim Miller
748bc36f2e Remove "final" qualifier from AuthenticationResult
This allows mock implementations to be created for testing
purposes.

Fixes bug 22362080

Change-Id: I5ff002c077d22b1338f2f4e394ad19827bb2ae9c
2015-07-09 03:19:31 +00:00
Sasha Levitskiy
12328ef422 Merge "Fingerprint: Add post enroll interface." into mnc-dev 2015-07-08 22:59:51 +00:00
Sasha Levitskiy
e0943cf566 Fingerprint: Add post enroll interface.
Bug: 22007124
Change-Id: I9b74edd8e34eaf9ab559b6dc20030a95fa3ce321
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-07-08 15:38:07 -07:00
Chien-Yu Chen
72333917a7 Camera: Enforce ZERO_SHUTTER_LAG mode
Camera devices that support YUV or PRIVATE reprocessing must list
ZERO_SHUTTER_LAG mode in android.edge.availableEdgeModes and
android.noiseReduction.availableNoiseReductionModes, and it must
be the default mode for ZSL template.

Bug: 22266686
Change-Id: I4728b2261760d11d695e9e364d8a72b3b2d31284
2015-07-08 11:55:19 -07:00
Chien-Yu Chen
3054f59514 Merge "Camera2: implement Key.toString()" into mnc-dev 2015-07-07 22:17:08 +00:00
Chien-Yu Chen
69421363c6 Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 2015-07-07 22:16:10 +00:00
Eino-Ville Talvala
384a04d936 Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev 2015-07-07 21:36:47 +00:00
Eino-Ville Talvala
0dd17509a9 Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
This mode splits processing quality based on stream resolution, to
enable ZSL operation where low-resolution (preview/recording) streams
require more processing since they are immediately user-visible, while
the high-resolution intermediate ZSL stream should have minimal/no
processing since it will be reprocessed into final quality when
necessary

Bug: 22266686

Change-Id: Ib41102b66b07d61a099f021f8c6251f28c62686f
2015-07-07 13:39:55 -07:00
Aravind Akella
c5889757cb Merge "Clean up get sensorList." into mnc-dev 2015-07-07 19:53:46 +00:00
Chien-Yu Chen
12a8385b7e Camera2: implement Key.toString()
Implement toString() for CameraCharacteristics.Key,
CaptureResult.Key, and CaptureRequest.Key.

Bug: 22279124
Change-Id: Ib1076e3f6d7bcbffbb148a7a01f72133daccebb8
2015-07-07 12:17:22 -07:00
Chien-Yu Chen
e0ee63046a ImageWriter: Exception when Surface is abandoned
Throw IllegalStateException when queueing or dequeueing an
image if the input surface is already abandoned by the consumer.

Also fix a crash when planes are not initialized when closing
ImageWriter.

Bug: 22279111
Change-Id: I8301920d64a53c45b29e947e52ff323733abbf16
2015-07-06 18:26:28 -07:00
Aravind Akella
adaa79d722 Merge "Remove flag mDataInjectionMode." into mnc-dev 2015-07-07 00:24:04 +00:00
Aravind Akella
d4cc5ec230 Remove flag mDataInjectionMode.
Change-Id: Ia7cbe8942168ac57abbb92c1a1ed51c568be94fe
2015-07-06 14:57:23 -07:00
Eino-Ville Talvala
539d18c5a9 Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev 2015-07-06 17:51:48 +00:00
Aravind Akella
516e40ea5d Clean up get sensorList.
Change-Id: I46da79cc50b5130a3f21bd567f50b29bf22196f9
2015-07-01 16:56:25 -07:00
Ruben Brunk
e4ed47087f Merge "camera2: Fix ABI for new tags." into mnc-dev 2015-07-01 20:51:17 +00:00
Ruben Brunk
1b02df456f camera2: Fix ABI for new tags.
Bug: 22229158
Change-Id: If8dc8524258b59b45e56ce54f451c59b9c7e79e2
2015-07-01 12:53:45 -07:00
Aravind Akella
ef8d2bba23 Merge "Fix for last sensor missing from sensor list returned by the HAL." into mnc-dev 2015-07-01 18:04:44 +00:00
Aravind Akella
b02e6050bd Fix for last sensor missing from sensor list returned by the HAL.
Bug: 22072216
Change-Id: I39a422fb80adcd348ff9c10bf3d3f19ab569a0af
2015-06-30 18:02:45 -07:00
Eino-Ville Talvala
81e89282f3 Camera2: Remove FREEFORM cropping requirement from FULL
To enable FULL to cover high-resolution devices better.

Bug: 22207844
Change-Id: I74a80071c77a2bb65d0731604adea9b9e937b361
2015-06-30 16:34:24 -07:00
Aravind Akella
d123b51f8b Changes to Data Injection mode APIs
Change-Id: Id55eaf03656d2d55df7f38d4cac643d97354fe9b
2015-06-29 13:04:09 -07:00
Chien-Yu Chen
f09fd213c3 Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev 2015-06-26 22:09:37 +00:00
Chien-Yu Chen
58a152e359 Merge "Camera2: Clarify session callbacks" into mnc-dev 2015-06-26 22:05:05 +00:00
Jim Miller
63ec93d570 Merge "Have FingerprintService keep the device awake on relevant events." into mnc-dev 2015-06-26 21:01:24 +00:00
Eino-Ville Talvala
daee1e5bde Merge "Camera2: Add clarification about simultaneous trigger use" into mnc-dev 2015-06-26 19:53:30 +00:00
Chien-Yu Chen
161a76cae4 Camera2: Remove references to sync.frameNumber
sync.frameNumber is a hidden key.

Bug: 21957397
Change-Id: I3b235d776782a8441354ee24c9174ae30e074a61
2015-06-26 11:23:55 -07:00
Chien-Yu Chen
078c92a6b2 Camera2: Clarify session callbacks
If a prior session exists when a new session is created,
onClosed() for a prior session may be invoked after
onConfigured() for the new session.

Bug: 22072379
Change-Id: I6d4416b8e77d073e569ca55867dd705c245886d0
2015-06-25 16:54:17 -07:00
Eino-Ville Talvala
f8a2f57590 Camera2: Add clarification about simultaneous trigger use
Allow triggers to be activated at the same time, and specify
allowed behaviors.

Bug: 21399067
Change-Id: Ia4b06dbdffabe9c1b85907b13022142ffd00caa4
2015-06-24 15:36:38 -07:00
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
Jim Miller
dca15d22e8 Have FingerprintService keep the device awake on relevant events.
Fixes bug 20732273

Change-Id: I61b827dd7b1bc706a0288571751032301fd5479f
2015-06-17 17:52:14 -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