Commit Graph

466 Commits

Author SHA1 Message Date
Zhijun He
d84bd0a5f3 Update camera metedata
Change-Id: Ib33da76659c7aa5364ec2c3abc3613cf23eb7c36
2013-07-18 15:18:05 -07:00
Eino-Ville Talvala
855ccce701 Camera2: Remove/@hide non-public keys.
Change-Id: I28fc5d6d41a444730061b6d2652f5cb75f97d56b
2013-07-16 11:13:12 -07:00
Igor Murashkin
d7bf1778df camera2: Implement CameraDevice#getCameraInfo
Bug: 9529161
Change-Id: Ie37d1e07bb8416cbb141f4d49e52337bf7236610
2013-07-15 13:37:08 -07:00
Igor Murashkin
b9dd637f83 camera2 api: Generate metadata keys and enums from XML
Change-Id: I9b04b5933c5922fc522e9216f4deebcd6fc24d78
2013-07-12 17:25:50 -07:00
Igor Murashkin
b519cc52ec camera2 api: Add CameraMetadata get/set support
* Add a Rational class
* Can get/set Key<T> where T is a primitive (or Rational)
* Can get/set Key<T> where T is a primitive array
* Can get/set Key<T> where T is an enum (synthetic constructor only)

Not implemented yet:
* When T is anything else, i.e. Rect, Size, etc

Bug: 9529161
Change-Id: I64438024a1e8327a38dd2672652626f0ffbb70e3
2013-07-11 13:06:56 -07:00
Mathias Agopian
b25c0efad2 be more robust with handling unknown sensors
- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up

Bug: 9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
2013-07-08 15:24:09 -07:00
Zhijun He
b8b77bf59e Correct request template value for record and still
they should match the request template values defined in camera3.h.

Bug 9213377

Change-Id: Ib24aa33a0ed59aff14b115c5d213ac287ea0d948
2013-06-28 17:46:45 -07:00
Igor Murashkin
70725500dc Initial camera device implementation
* Working streaming preview requests only
* Almost everything else returns empty objects that don't do anything

Bug: 9213377
Change-Id: Ie6f02a7c0952b0f5ebc41905425b15cae221f7d3
2013-06-26 13:19:45 -07:00
Igor Murashkin
e363fbb264 Partial CameraManager implementation
Bug: 9213377
Change-Id: I8f89fb94d7081a71b38e5cd0ad89116d219b4c33
2013-06-26 13:19:44 -07:00
Igor Murashkin
a858308ed2 Revert "Partial CameraManager implementation"
This reverts commit e473f7d8f9.

Change-Id: I23e92ca2def0ebf507f6c782442a4698745bc926
2013-06-25 05:15:02 +00:00
Igor Murashkin
e473f7d8f9 Partial CameraManager implementation
Bug: 9213377
Change-Id: I29864a5d1f7971ed589d1ffaddeefbb703e34018
2013-06-24 17:41:09 -07:00
Craig Mautner
48d0d18867 Add activity token to display system.
First step in adding activity specific information to displays.
Replace CompatibilityInfoHolder with DisplayAdjustmentsHolder that
holds an activity token in addition to the CompatibilityInfo.

Change-Id: Ie113cd8dd9c62e0b5311204e039a4829096bea68
2013-06-22 15:30:13 -07:00
Jeff Brown
a506a6ec94 Add an API to allow for creating private virtual displays.
This change enables applications to create a private virtual
display that renders its content to a surface of its own creation.
The display is private in the sense that only the application
that owns the display is allowed to place windows upon it.
Mirroring and blanking is also disabled for these displays.

Bug: 9192512
Change-Id: I852ea07f0c7df1d244e354e3daca3a6960285ca0
2013-06-18 15:32:41 -07:00
Chong Zhang
e0dae4b493 Merge "MediaRouter: grey out wifi displays that's in use" 2013-06-15 00:36:15 +00:00
Scott Main
d2e2cc99d0 am 695be87d: am 92053f8b: revise docs for new sensor types. fix markup error causing tons of code font
* commit '695be87d6e87fada03b548d05f82e004d0cdb240':
  revise docs for new sensor types. fix markup error causing tons of code font
2013-06-14 09:11:41 -07:00
Chong Zhang
ab87a63997 MediaRouter: grey out wifi displays that's in use
bug 9229799

Change-Id: I9f5fd2107f60c492d42c74e575e6483838a51267
2013-06-13 20:17:39 -07:00
Scott Main
92053f8b28 revise docs for new sensor types. fix markup error causing tons of code font
Change-Id: I7635bbc44e03b50faeddf5c5fe50f7f47e2cde35
2013-06-13 16:37:51 -07:00
Igor Murashkin
a1b02dbb6e Fix build break due to javadoc linking error
Change-Id: I9da1cb03afef25c11844ec863200f7b5b009e77a
2013-06-11 15:25:20 -07:00
Igor Murashkin
cf88be6dc8 Merge "camera: Add Java binder proxies for some existing binder interfaces" 2013-06-11 20:45:19 +00:00
Igor Murashkin
4491d684f4 camera: Add Java binder proxies for some existing binder interfaces
Note that anything not in the AIDL interfaces, will NOT be magically
compatible if you just add it there. It probably requires a change in
frameworks/av/camera as well.

Bug: 9213377
Change-Id: I91d3efb755ed2e3ace139f83573f86efdccccd06
2013-06-11 11:36:38 -07:00
Eino-Ville Talvala
b2675542c2 Initial commit of new camera API, mostly just the interface.
- New core API classes in android.hardware.photography
- android.media.Image and android.media.ImageReader classes for
  application access to direct hardware image buffers.
- Additions to android.graphics.ImageFormat to describe new image
  types needed by new camera API.
- Some documentation included; very little implementation.

Bug: 9111736
Change-Id: I0680f35944d1cb8845b7dc0c67edc8c0f0864573
2013-06-07 21:29:45 +00:00
Chong Zhang
21f603996e wifi-display: set display to unavailable if p2p device is unavailable
Bug 9229799

Change-Id: I680015943f40cded45645dfa0eae42bbce5ce9a3
2013-06-06 15:49:16 -07:00
Scott Main
436a1c651a am 63fcfd5a: am 06543a45: small cleanup of trigger event javadoc
* commit '63fcfd5a52090542e5da601336f712ee64e61d8a':
  small cleanup of trigger event javadoc
2013-06-05 14:44:20 -07:00
Scott Main
06543a4559 small cleanup of trigger event javadoc
Change-Id: Ib8a0fc0a7ddac6259cc1bb9e8701b0d570a101c6
2013-06-05 14:29:50 -07:00
Zhentao Sun
da86196287 am 0412f5b1: am 5f8afdd8: Merge "Passed the correct gps geofence availability value to client." into jb-mr2-dev
* commit '0412f5b1165d7ff331162dcd1fc29d3ea0fc7223':
  Passed the correct gps geofence availability value to client.
2013-05-14 16:55:44 -07:00
Zhentao Sun
b8061be81c Passed the correct gps geofence availability value to client.
Fixed b/8967427.

Change-Id: If205b963533f096c27985476a5d487a2d090ccf8
2013-05-14 15:34:15 -07:00
kmccormick
3b0929f2a4 am cca053a3: am 3722947f: Merge "Doc update: manual merge of changes from jb-mr1.1" into jb-mr2-dev
* commit 'cca053a389bf913f23796e1095db9e1ae74bf2f0':
  Doc update: manual merge of changes from jb-mr1.1
2013-05-14 11:30:47 -07:00
kmccormick
3722947f2f Merge "Doc update: manual merge of changes from jb-mr1.1" into jb-mr2-dev 2013-05-14 18:26:38 +00:00
Zhentao Sun
2ae118d107 am e0dda90b: am aa64548d: Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev
* commit 'e0dda90bde531b12dda8ce0909040b070c3b2b84':
  Fixed unreleased wake lock isues and NPE.
2013-05-07 11:47:19 -07:00
Zhentao Sun
cfa496f7cd Fixed unreleased wake lock isues and NPE.
Fixed b/8834502. Wake lock might not be released when the callback is null.
NPE is thrown when the callback is null in some cases too.

Change-Id: I27d3af810669e446cfb57aba8715c80cba3e15e7
2013-05-06 11:22:44 -07:00
Zhentao Sun
752625c844 am 460778f1: am 906e57d8: Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev
* commit '460778f10475bb9fa02cbfe8af7faef38807435c':
  Fixed race conditions in GeofenceHardwareImpl.
2013-04-30 08:31:46 -07:00
kmccormick
5d555a7b98 Doc update: manual merge of changes from jb-mr1.1
Change-Id: I9f738f62c5e147c4bacacd674ed15a18b089f860
2013-04-29 14:43:18 -07:00
Zhentao Sun
f8f085c51b Fixed race conditions in GeofenceHardwareImpl.
Fixed b/8725226
1. Check if a geofence is registered before calling removeGeofence,
pauseGeofence and resumeGeofence
2. Moved add/remove operation of mGeofences from handler thread to
binder thread to fix potential race conditions by REMOVE_GEOFENCE.

Change-Id: I1c68a49ac4a08324c13702ba9013d2adf031aed9
2013-04-26 14:41:53 -07:00
Jeff Brown
1345bf762b am 31ae3908: am 8adf5d2b: Merge "Undeprecate old UsbDeviceConnection methods." into jb-mr2-dev
* commit '31ae3908fb6d4eccc04920ddaff557b76110fe30':
  Undeprecate old UsbDeviceConnection methods.
2013-04-18 19:22:33 -07:00
Jeff Brown
e783d99038 Undeprecate old UsbDeviceConnection methods.
Per api review, retain the overloads that do not accept a
buffer start offset.

Bug: 8656781
Change-Id: Ie00aca7d3a4708700c5ddf60e3309e609788a67f
2013-04-18 19:17:35 -07:00
Eino-Ville Talvala
2661bbd219 Merge "Camera: Add hidden camera preview to renderscript allocation API" 2013-04-18 22:44:47 +00:00
Jaikumar Ganesh
176c245cef Merge "Hardware geofence API changes." into jb-mr2-dev 2013-04-18 05:18:41 +00:00
Jaikumar Ganesh
da6508954a Hardware geofence API changes.
b/8631678

1.GeofenceRequest object created.
2.MonitorState moved to a new callback
3.getTypeAndStatus separated to 2 calls.
4.Binder death implemented
5.geofenceChange callback name changed.
6.Parameters rearranged in some calls.

Change-Id: I8fe9621186aeb49efeb0eef1821a2556afe03cfc
2013-04-17 22:18:01 -07:00
Eino-Ville Talvala
7005b67c12 Camera: Add hidden camera preview to renderscript allocation API
- Camera.createPreviewAllocation() creates YUV allocations for use as
  a preview buffer destination.

- Camera.setPreviewCallbackAllocation() sets such an allocation as the
  target for preview data from camera.

Bug: 8563840
Change-Id: Ie42033976fed825d396550bbc033d434c8206b6b
2013-04-17 18:35:26 -07:00
Jaikumar Ganesh
edb5242355 Fix wrong index value.
Rotation vector was at the wrong index value.

b/8165631

Change-Id: I50662befabf80393965c94a0335359019b98eb85
2013-04-16 11:59:07 -07:00
Jaikumar Ganesh
2e90089766 Fix race condition and disable call.
1. A dispatch event can happen as soon you call enabled,
and we won't be ready to receive it. Also add error checks
and not crash if such a thing happens.

2. Java layer shouldn't call disable on the native layer
for trigger sensors. Native layer will clean up on its own.

b/8165631

Change-Id: Icbe76bd1f50632c0bcb0b3b04975b2c2f20ff36b
2013-04-12 09:37:59 -07:00
Jaikumar Ganesh
6d0c1d78f1 Sensor values changes.
1. Remove Sensor Event Pool.
2. Allocate fixed array values for each Sensor added.
   - Needed for backward compatibility.
3. Use SDK checks for backward compatibility for
   rotation vector.

b/8165631

Change-Id: I2d2cf10d3460478ed7af8e6188343f4bb033503c
2013-04-11 10:25:35 -07:00
Jaikumar Ganesh
9a8df4dcf9 Add new sensor types.
1. Add uncalibrated gyros and magnetic field sensor.
2. Change max number of events from 3 to 16.
3. Add new APIs for trigger sensors.

Change-Id: Ifac5c0024c8e5f88b721e5cd97ff26afaaa36717
2013-04-11 10:25:35 -07:00
Jaikumar Ganesh
8ce470dd4b GPS Hardware geofencing.
Add support for doing geofencing in hardware.

Change-Id: I6d5015190e8d84e1f4beb1010ed977a71c1622d0
2013-04-10 15:25:07 -07:00
kmccormick
326e8bf826 am 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
* commit '84bba9528c5d3baf22656746255b74e72b4555ff':
  Doc update: clarify rules for rate param
2013-03-28 18:10:08 -07:00
kmccormick
84bba9528c am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
* commit '297409fefcfb2704162536562db9395903476b44':
  Doc update: clarify rules for rate param
2013-03-28 18:07:59 -07:00
kmccormick
a230b3cb96 Doc update: clarify rules for rate param
"Bug: 5581113"

Change-Id: Ic87f1c331fba2b08de295b2d77832739bf823500
2013-03-28 17:58:57 -07:00
Ying Wang
b162617143 Fix doc build.
Change-Id: I479df06f2aed33bf29bb8d90be2339a80248beaa
2013-03-28 13:50:40 -07:00
Jeff Brown
6c81a93ef3 Support specifying buffer start offset for USB requests.
Deprecated existing API which only supported passing buffer
and length in favor of a new one that also supports passing
the start.

Being able to pass a start index is very important because
the kernel imposes size limits on how much data can be transferred
at a time so we often need to transmit large buffers in chunks.

Change-Id: I3484b5e68f1ece61d4645ea04be8ee6a3b79169d
2013-03-28 03:13:09 -07:00
Jaikumar Ganesh
1aab1dbca5 Revert "Add new sensor types."
This reverts commit bc03a348d7.
2013-03-13 15:00:21 -07:00