Commit Graph

1452 Commits

Author SHA1 Message Date
Aravind Akella
398e11837b Merge "Add hidden SensorManager APIs for injecting sensor data." 2015-04-25 01:40:26 +00:00
Ruben Brunk
998ee16570 Merge "camera: Start/stop preview before clearing surface." 2015-04-25 00:48:26 +00:00
Ruben Brunk
6faf98e235 camera: Start/stop preview before clearing surface.
- Works around HAL issues where preview must be
  explicitely stopped after takePicture call before
  the surface can be reset.

Bug: 20553124
Change-Id: I403d8c09dfee0cd192d4831376f9f8ed3d6ba444
2015-04-24 12:11:30 -07:00
Chien-Yu Chen
e79449aed0 Merge "camera2: validate reprocess request's session" 2015-04-24 17:14:50 +00:00
Aravind Akella
18ebf732b8 Add hidden SensorManager APIs for injecting sensor data.
Change-Id: If49467ced1a719c49bb5ac7ab670e86ff4642eaa
2015-04-23 17:30:04 -07:00
Chien-Yu Chen
7a316f6b1b camera2: validate reprocess request's session
Add a session ID to CaptureResult to indicate the session where
the result comes from. When creating a reprocess capture request
with a capture result, the session ID will be carried over to
the reprocess capture request. Reprocess capture request's session
ID will be used to validate that it matches the session ID when
submitting the reprocess capture request to a session.

Bug: 20263212
Change-Id: I024c1a28ecf0a43909a0ed3814a11360c318417f
2015-04-23 15:21:07 -07:00
Andres Morales
4d41a203a0 Expose getAuthenticatorId API
Change-Id: I112c45d596c66e3f6ebd94fecffcb6bb7c3a335a
2015-04-22 16:55:10 +00:00
Jim Miller
93ea09a376 Merge "Make fingerprint enroll/authenticate haptic feedback part of framework." 2015-04-21 17:45:52 +00:00
Jim Miller
af281ca0d3 Make fingerprint enroll/authenticate haptic feedback part of framework.
Change-Id: Icc2e9ec4b30a6f3a21e3bbe8476efc56361d6944
2015-04-20 19:04:21 -07:00
Jeff Brown
f9978f863f Merge "Fix leaks due to GC circular references." 2015-04-17 22:27:03 +00:00
Jeff Brown
3b4049e79b Fix leaks due to GC circular references.
The DisplayEventReceiver and SensorManager event queue both get
leaked when the Looper thread they are attached to dies because
the Java object holds a strong reference to its native peer and
meanwhile the native peer holds a strong reference to the Java
object through JNI.

Fixed the issue by indirecting through a weak reference as was
done for InputEventReceiver some time ago.

Bug: 12455729
Change-Id: I3d80a2a190192d1a2981bf5ae0cad30f0f7688a5
2015-04-17 15:24:31 -07:00
Eino-Ville Talvala
0b7b03b35f Camera2: Add DEPTH_OUTPUT capability and DEPTH_DEPTH_IS_EXCLUSIVE field.
- Define DEPTH_OUTPUT capability and its requirements.
- Add DEPTH_IS_EXCLUSIVE to support devices that cannot produce color and depth
  for the same capture.

Change-Id: I6e511b7b8625907d9fc751fe8a73a443edeeb2ab
2015-04-17 10:52:42 -07:00
Eino-Ville Talvala
86ea32a68c Camera: Add HIGH_RESOLUTION hardware level.
For camera devices that support very high resolutions, add
a level that allows for those resolutions to operate at lower
capture rates, while ensuring that a reasonable resolution is
still available for high-rate capture.

Change-Id: I4a0d904504ac8a976bd02fba89b238048d55a268
2015-04-17 10:52:41 -07:00
Andres Morales
4062c69d9a Merge "Make CryptoObject constructor public" 2015-04-16 01:08:44 +00:00
Jorim Jaggi
9e682ee383 Make CryptoObject constructor public
Change-Id: I9bfedd5113af7b4717194d99c7c9898753ea2ebd
2015-04-15 17:32:42 -07:00
Jorim Jaggi
053dee7928 Merge "More fingerprint API's for 3rd party apps" 2015-04-15 22:56:09 +00:00
Jorim Jaggi
2aad7ee245 More fingerprint API's for 3rd party apps
- Make isHardwareAvailable public
- Add hasEnrolledFingerprints so apps can check whether to show
fingerprint UI or not.

Change-Id: Iaefd5e9e68bf3bee8305574dc1477ea9bc72b30a
2015-04-15 14:55:43 -07:00
Ruben Brunk
93f593fdef Merge "camera: Add eviction errorcode to Camera1 API." 2015-04-15 19:16:39 +00:00
Ruben Brunk
e91b92546e camera: Add eviction errorcode to Camera1 API.
Bug: 19186859
Change-Id: Ie46150d130e769feb62935ebee8e32e96c0821fd
2015-04-15 12:13:26 -07:00
Eino-Ville Talvala
e9e5a162c0 Merge "Camera2: Add prepare method for output buffer pre-allocation" 2015-04-15 17:56:39 +00:00
Jim Miller
fe6439f02d Several fixes to Fingerprint code after large merge
- route fingerprint enrollment auth token
- replace "processed" event with "authenticated"
- fix type-o in strings.xml

Change-Id: If06b4438c94fd7fca07a8b7b1b5fa16dd94b3831
2015-04-14 20:47:55 -07:00
Eino-Ville Talvala
ad916f7fd3 Camera2: Add prepare method for output buffer pre-allocation
Normally, buffers for camera output Surfaces are allocated as
needed. This minimizes memory overhead and time to first frame.

However, if allocation takes a long time, as it can do for full-resolution
output buffers, full frame rate may not be maintainable with the added
allocation overhead.

The prepare() method allows an application to indicate that buffers for
a given output Surface should be preallocated by the camera device.
Once the allocation is complete, the onSurfacePrepared callback is invoked.
The application may then use the prepared Surface without concerns about
allocation-caused delays.

Change-Id: I4f616dc87dd4346f408cf1ea37d48a642ceb57da
2015-04-14 16:36:50 -07:00
David Christie
b808440014 Ensure GeofenceHardware will return capabilities for old implementations.
New FLP HAL implementations will explicitly return their capabilities,
but old versions won't (the implicit capability in old versions was
GNNS).  Ensure that the getCapabilities feature of GeofenceHardware
will return GNNS for old binaries, so GmsCore doesn't have to worry
about versioning.

Change-Id: I4b1c942b0d68d87bfbb18b8c06fd9d8b8f68efa6
2015-04-14 14:54:48 -07:00
David Christie
71bcd2aa5c Merge "Add versioning to FLP HAL." 2015-04-14 21:37:02 +00:00
Jorim Jaggi
7caa691652 Merge "Fix fingerprint API for 3rd party apps" 2015-04-14 21:12:27 +00:00
Jorim Jaggi
ccdfa93f60 Fix fingerprint API for 3rd party apps
Change-Id: Id68d04b4deef9940a683d2b40f1db231845b00e3
2015-04-14 14:02:16 -07:00
David Christie
cfc9b6d6ab Add versioning to FLP HAL.
Retain compatibility with implementations compiled
against old headers or left unchanged from LMP.

Change-Id: I3f7cfaaf0cba8697c312940a805b053c6040caa6
2015-04-14 12:14:03 -07:00
Chien-Yu Chen
7681fbb98e Merge "camera2: add reprocess support" 2015-04-14 17:29:46 +00:00
David Christie
fff30439ca Add ability to flush FLP HAL batched locations buffer.
Currently GmsCore has to guess how many locations to retrieve
based on requested frequency and then demux the output looking
for timestamps (that aren't monotonically increasing).  This
capability gives GmsCore a more graceful solution.

Change-Id: Ie1d71615f699bc0d3c63f8b80aa7b40b9971cf96
2015-04-13 19:13:52 -07:00
David Christie
832017963d Merge "Add a status callback for location batching in FLP HAL" 2015-04-14 01:30:15 +00:00
David Christie
15003f19e5 Add a status callback for location batching in FLP HAL
-Allows GmsCore to know when location is unsuccessful so
 it can switch to a SW solution.

Change-Id: I3d1df7b828f7fb189446881eea87d9a952310614
2015-04-13 17:25:27 -07:00
David Christie
172753e6f8 Merge "Add capability callback for FLP HAL." 2015-04-14 00:09:36 +00:00
Chien-Yu Chen
5398a67680 camera2: add reprocess support
Add reprocess API and implementation to support creating reprocess
capture sessions, reprocess requests, and receiving reprocess capture
results.

Change-Id: I4c1c02f41d1712f65e729ea3ba09592a27ffe86d
2015-04-13 17:04:04 -07:00
Yin-Chia Yeh
7d43893bb9 Merge "Camera: update AE/AWB lock spec" 2015-04-13 20:01:43 +00:00
Yin-Chia Yeh
7e3e431934 Camera: update AE/AWB lock spec
Codegen doc update.

Bug: 20039760
Change-Id: I92786f1e4366185029aca63794e58374c92bc948
2015-04-13 12:59:39 -07:00
David Christie
ffca45a2cd Add capability callback for FLP HAL.
Let HAL implementation tell if geofencing/batching is
supported and which technologies (GNNS, wifi, etc)
can be used.

Still todo: Add ability for GmsCore geofencing to
tell which technologies are supported (instead of
just using it to update monitoring).  This requires
SystemApi change + approval so will do in separate CL.

Note that the classes in the lib are not copied
directly into GmsCore.  The instance will always
be whatever is in the platform.  This is why
the callback is backwards compatible as long as
their is a default implementation (but not if
it's abstract).

Change-Id: I7d6adeb049b89935bc4443785df5d7ef4c730e5d
2015-04-12 16:22:03 -07:00
Jim Miller
ce7eb6daf0 Clean up FingerprintManager API and make it public.
Change-Id: I6a99dccd485c053cb47dbd0ec08b41a2dc5b17c8
2015-04-11 12:34:56 -07:00
Eino-Ville Talvala
dddc56660a Merge "Revert "Revert "Camera2: Add camera pose and distortion fields""" 2015-04-10 23:54:39 +00:00
Eino-Ville Talvala
046a978f68 Revert "Revert "Camera2: Add camera pose and distortion fields""
This reverts commit fb48944298.

Change-Id: I205904bf9be8149cda0b9aeda68948f14b5d64fb
2015-04-08 20:05:56 +00:00
Timothy Knight
fb48944298 Revert "Camera2: Add camera pose and distortion fields"
This reverts commit da1e6411be.

Change-Id: Id04cc86cf9740a2a9bf5eb047b633a2abd90f561
2015-04-08 19:13:43 +00:00
Eino-Ville Talvala
da1e6411be Camera2: Add camera pose and distortion fields
- android.lens.info.poseRotation
- android.lens.info.poseTranslation
- android.lens.info.intrinsicCalibration
- android.lens.info.radialDistortion

Change-Id: I3f8cf258b600bc58d0743e44aa6c456cd4b8a906
2015-04-08 18:37:03 +00:00
Chien-Yu Chen
0a551f1487 camera2: add reprocess format map
Add reprocess format map to StreamConfigurationMap and add support
for ImageFormat.PRIVATE.

Change-Id: I5dd8ecbbb63231574a9ca4bf27c374b4a220e0ed
2015-04-07 16:57:23 -07:00
Yin-Chia Yeh
7891a2efed Merge "Camera: update semantics of HIGH_QUALITY mode" 2015-04-06 18:55:12 +00:00
Yin-Chia Yeh
1ffaca4414 Merge "Camera: add equals/hashCode to OutputConfiguration" 2015-04-06 17:42:47 +00:00
Eino-Ville Talvala
456432ead7 Camera2: Wire depth formats into StreamConfigurationMap
Change-Id: I9046b60dca83d090efd9c74c98bfdfebdeae8751
2015-04-03 18:48:04 +00:00
Yin-Chia Yeh
61f1536612 Camera: add equals/hashCode to OutputConfiguration
Bug: 20057354
Change-Id: Ib9c2e26ac4c52c47ccab86a7f25363b164d36eb6
2015-04-03 10:46:25 -07:00
Yin-Chia Yeh
fba08dd9b4 Camera: update semantics of HIGH_QUALITY mode
Codegen doc update.

Bug: 19665478
Change-Id: I9ef9ddefcf32b1ff981e0ffa4b440ddf64ba99c2
2015-04-02 14:05:14 -07:00
Jim Miller
ebbf205bc6 Prepare to make Fingerprint API public.
- move fingerprint support files into hardware area
- move jni into services/core

Change-Id: I48a8e43d6d328fb66d79919c255e4c44e984b4d1
2015-04-01 19:20:08 -07:00
Ruben Brunk
095d999045 Merge "Add CameraService to system server." 2015-03-31 22:27:53 +00:00
Ruben Brunk
9d21ee5d77 Add CameraService to system server.
- Adds a camera service to system server that forwards events to the
  mediaserver camera service.
- Notify the camera service when the device user changes.

Bug: 19186859
Change-Id: I172a2ce46c8e8a131ae7e8dd99d60c5f4f0d6668
2015-03-31 12:01:22 -07:00