Commit Graph

492 Commits

Author SHA1 Message Date
Eino-Ville Talvala
b6c38e9de1 Camera2: Remove redundant Keys classes
Also update tests accordingly

Bug: 10345522
Change-Id: I8c7d17cdfbda6faba09134745a96089bf1b70cb7
2013-08-19 20:37:37 +00:00
Eino-Ville Talvala
f55916bd31 Merge changes I6d125624,I549a9211 into klp-dev
* changes:
  Camera2: Fixed issue with HashSet not being initialized
  Camera2: Documentation fixes, mostly capitalization mistakes
2013-08-19 19:12:53 +00:00
Ruben Brunk
94a26df84f Merge "Refactor CameraService to handle errors properly." into klp-dev 2013-08-17 00:29:37 +00:00
Ruben Brunk
66ef645144 Refactor CameraService to handle errors properly.
Bug: 10361136

- Connect calls now return status_t error flags.

Change-Id: Ibce9ab047348cfcade7e70a2ef03f5a833e13af8
2013-08-16 18:34:23 +00:00
Eino-Ville Talvala
4068388bee Camera2: Add user tag to CaptureRequest
Bug: 10360518
Change-Id: I781341b4c598c28ee5dd7551b8e05ab19b8fff0d
2013-08-16 11:10:21 -07:00
Benjamin Hendricks
d27e8768bc Camera2: Fixed issue with HashSet not being initialized
Bug: 10345921
Change-Id: I6d12562484b0ed9c59b22e231c3dd050e046b58d
2013-08-15 14:31:38 -07:00
Benjamin Hendricks
24eb8a313f Camera2: Documentation fixes, mostly capitalization mistakes
Bug: 10343538
Change-Id: I549a92117c6ecca385e55c0ca2187c5ee82f024b
2013-08-15 14:31:20 -07:00
Eino-Ville Talvala
66a83ae650 Merge "Camera2: Add metadata keys and enum values" into klp-dev 2013-08-14 20:20:43 +00:00
Igor Murashkin
d48233e1e6 Merge "camera2: Clear up docs for CameraDevice#configureOutputs" into klp-dev 2013-08-14 00:16:42 +00:00
destradaa
0682809ad0 Add support in the platform for Flp Geofencing.
Change-Id: I0fb0e276d3a06322697bb5d46323779aca1f78c5
2013-08-13 16:00:04 -07:00
Igor Murashkin
53f91c5c26 camera2: Clear up docs for CameraDevice#configureOutputs
Change-Id: Id2397ca17c5968cb4dfdb337ea56be9d5f481669
2013-08-13 14:37:42 -07:00
Eino-Ville Talvala
5a32b20ccc Camera2: Add metadata keys and enum values
- Insert metadata enum ints into CameraMetadata
- Insert metadata Keys into relevant files
- Remove some dead code in CameraMetadata

Generated from /system/media/camera/docs.

Change-Id: I3d864ad8c7add5f35ca740860cb2883d54a0791e
2013-08-13 12:35:57 -07:00
destradaa
1af4b0280a Add FlpHal layer to support Location Batching.
Change-Id: Ia3a57d869dfb3f067a1b95fa66d54f311ddcfdc3
2013-08-08 15:27:38 -07:00
Aravind Akella
f0f4a83112 Fix for build breakage. Correcting the documentatation link in Sensor.java. I added a wrong link {@link #SENSOR_TYPE_ROTATION_VECTOR} instead of {@link #TYPE_ROTATION_VECTOR}.
Change-Id: I55be472c554a5170f3db64b9cb49337a1f4691c0
2013-08-07 20:11:27 -07:00
Aravind Akella
52df1db3ce Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR." 2013-08-08 01:26:40 +00:00
Aravind Akella
4b628cb53d Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR.
Change-Id: I31fbdf379454e71950b111f2461bdb430f3352fc
2013-08-06 14:58:12 -07:00
Jean-Baptiste Queru
3c9c091863 Revert "Revert "be more robust with handling unknown sensors""
This reverts commit 17548b3c70.
2013-08-05 11:03:28 -07:00
Jeff Brown
7d00affce6 Support public virtual displays.
Refactor the new private virtual display API to also support
creating public virtual displays with various characteristics.
This feature requires special permissions and is only intended
for use by the system.

Change-Id: I44dd19f37cf76ea6d6e313afe42f4a412bd96663
2013-08-02 21:11:07 -07:00
Jean-Baptiste Queru
1e01943fe1 am ae311f4c: am 17548b3c: Revert "be more robust with handling unknown sensors"
* commit 'ae311f4c5f86779bb681b9fa8c1122dc174fea72':
  Revert "be more robust with handling unknown sensors"
2013-08-02 17:58:40 -07:00
Jean-Baptiste Queru
17548b3c70 Revert "be more robust with handling unknown sensors"
This reverts commit 80ba0a6bae.
2013-08-02 17:31:54 -07:00
Mathias Agopian
80ba0a6bae 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-08-02 13:49:41 -07:00
Zhijun He
ecb323e3ce Camera2 API: Fix missing callback issue
Callback/Listener classes must extend the AIDL Stub class and implement the
methods. Also rename the frameId to requestId to avoid confusion.

Change-Id: I1b2f0e2f99230917f9e0e1875ba3ba1c7859c805
2013-07-31 12:02:07 -07:00
Eino-Ville Talvala
2f1a2e423e Camera2 API: Rename package to android.hardware.camera2
Change-Id: I77b7939e199f9fe8e12a59393c24cff08097448c
2013-07-30 11:37:31 -07:00
Zhijun He
7f4d3147d1 camera2: Implement CameraDevice#waitUntilIdle
Also cleanup some logging/comments.

Change-Id: Id1a4dd853519802a2b74b8d2172095ba388329e6
2013-07-23 13:46:37 -07:00
Igor Murashkin
3710db80d4 camera2 api: marshal rect, size, string for metadata
Change-Id: Iec2fd823bc92394da44abb32ca38a625d7638e3d
2013-07-19 12:04:48 -07:00
Igor Murashkin
27b62ae8eb camera2 api: Output classes for key types where it makes sense
Change-Id: I0f74c110cc4917bfd96d812ee98c385bb1b937b7
2013-07-18 16:49:24 -07:00
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