Commit graph

366 commits

Author SHA1 Message Date
Jesse Hall
b3f211aa06 Merge "Add new HWC 1.1 queries and hotplug callback" into jb-mr1-dev 2012-08-31 12:56:58 -07:00
Jesse Hall
2c13759c61 Add new HWC 1.1 queries and hotplug callback
Change-Id: I40164e60b33174e98a3843ec99f1680b1bb1c675
2012-08-31 09:25:46 -07:00
Jesse Hall
673a810469 Merge "Encode header version in api versions" into jb-mr1-dev 2012-08-30 13:53:14 -07:00
Jesse Hall
3f5b522ac9 Encode header version in api versions
Change-Id: I0216bef3ba0cfaed2fe908f735e546d0734c0b13
2012-08-29 10:36:36 -07:00
Eino-Ville Talvala
2388a2dc91 Camera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
Align camera2's management of platform-opaque formats with rest of
framework. Instead of using CAMERA2_PIXEL_FORMAT_OPAQUE, use
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED as the format for both the
camera HAL and for gralloc, and depend on the gralloc usage flags to
let the gralloc module select the appropriate real format for specific
stream endpoints.

Add a new gralloc usage for ZSL mode, where the camera service will
hold a streaming circular buffer of opaque full-resolution images
during camera preview. Since this is an opaque format that needs to be
optimized for 30fps operation, need gralloc to be aware of this use
case.

Bug: 6243944
Change-Id: If7f2516649381ce9bcffe4e319b63cbc068f643f
2012-08-28 14:22:53 -07:00
Eino-Ville Talvala
b8b6439598 Camera2: Make static_camera_characteristics const.
Disallow modification to static characteristics structure, and clarify
ownership and lifetime of the structure.

Also update test code accordingly.

Bug: 6243944
Change-Id: I6921d6889937212867efb99aa3881ab3ffc4f6f9
2012-08-27 10:30:04 -07:00
Eino-Ville Talvala
43a2bbb9de Merge "Revert "Camera2: Make static_camera_characteristics const."" into jb-mr1-dev 2012-08-26 14:44:46 -07:00
Eino-Ville Talvala
dde2a9d4b5 Revert "Camera2: Make static_camera_characteristics const."
Needs a third change that's not yet done with review.

This reverts commit c9ec8a656b59912f496880d3a63c0decd490f09d

Change-Id: Ic3e465e1308cbf107a250ec17b73a59a35e52f9f
2012-08-26 14:44:38 -07:00
Eino-Ville Talvala
f186f98fb0 Merge "Camera2: Make static_camera_characteristics const." into jb-mr1-dev 2012-08-26 14:15:55 -07:00
Eino-Ville Talvala
d959ec5297 Camera2: Make static_camera_characteristics const.
Disallow modification to static characteristics structure, and clarify
ownership and lifetime of the structure.

Also update test code accordingly.

Bug: 6243944
Change-Id: Ib8de5e9d6580187b21a5ae9a28a3d24f1d083f7b
2012-08-24 14:28:54 -07:00
Jesse Hall
0a0a41653d Simplify and clean up legacy decisions
During the HWC 0.x evolution, some fields were left optional or
organized strangely to avoid breaking backwards compatibility. Since
we're breaking it in the transition to HWC 1.0 anyway, we can clean
these up a little.

* The current callbacks are now registered immediately after the
  device is opened and guaranteed to be present, so the implementation
  can rely on them being present.

* The hwc_methods_t structure is gone, with its two methods folded
  into the main hwc_composer_device_1_t.

* All methods and callbacks are now required except dump(). New
  methods and callbacks we add in the future will still be optional
  for backwards compatibility.

Change-Id: I5d58774a5144016993c12df3dd6ad2a5d746bee9
2012-08-22 12:10:06 -07:00
Jesse Hall
43b51d9fdd Add NUM_DISPLAY_TYPES query and refine display list semantics
Change-Id: I740859bfa2b126edcdf06f7b2c8208770bc864f9
2012-08-22 12:10:06 -07:00
Jesse Hall
f4e4624ef7 Define HWC_DEVICE_API_VERSION_1_1
Change-Id: I925e010fb6367979de9b7657607ea5b444820a7e
2012-08-21 15:24:55 -07:00
Jesse Hall
43923defb7 Merge "HWC 1.1: add FRAMEBUFFER_TARGET layer type" into jb-mr1-dev 2012-08-20 16:34:03 -07:00
Jesse Hall
d18c83fc04 HWC 1.1: add FRAMEBUFFER_TARGET layer type
Change-Id: I61965c343dceb4137bc439b49ea90ec13183b719
2012-08-16 16:21:13 -07:00
Colin Cross
705d2912b7 hwc: update blank documentation to specify that blank is synchronous
Change the documentation of the blank function in the hw composer to
specify that the screen state transition must be complete when the
function returns.

Change-Id: Ibd0a9cdef13991c36cabada5fc0e4f7bb8fa7af9
2012-08-16 14:46:45 -07:00
Eino-Ville Talvala
f7a60c464a Camera2: Add ZSL pixel format, AF CANCEL trigger, lots of docs
- Add CAMERA2_HAL_PIXEL_FORMAT_ZSL
- Add CAMERA2_TRIGGER_CANCEL_AUTOFOCUS
- Add documentation to describe how AUTOFOCUS and CANCEL_AUTOFOCUS
  triggers interact with AF state, mode, and notifications.
- Other minor edits

Bug: 6243944
Change-Id: I679c40cfe08e62d3a5851839f748fe2292bbfae7
2012-08-10 09:25:49 -07:00
Jamie Gennis
8655693eff Merge "Simplify prepare and set semantics (comments only)" into jb-mr1-dev 2012-08-07 16:20:07 -07:00
Jesse Hall
ac3f7e195c Simplify prepare and set semantics (comments only)
Documentation updated for semantic changes vs. HWC 0.x:

* Prepare won't be called with NULL pointers. This used to be used to
  disable hardware composition, though that wasn't documented. Now
  we'll call prepare with non-NULL pointers but the layer list will
  have zero layers.

* Set won't be called with NULL pointers. This used to cause the
  display to turn off; that is now done by calling the blank() method,
  which is no longer optional.

Change-Id: I9c69dc34f64e499a5ba5f8729836e7c216f8c733
2012-08-07 16:08:35 -07:00
John Grossman
47bf3d7ea5 Extend the audio HAL interface to support get/set master mute
(cherry picked from commit d245968b7ef0be5c776c9aefff3eca9e293d1b35)

> Extend the audio HAL interface to support get/set master mute
>
> Hand merge from ics-aah
>
> > Extend the audio HAL interface to support get/set master mute: DO NOT MERGE
> >
> > Extend the audio HAL interface to allow HALs to optionally support HW
> > level master mute.  This follows the same pattern as master volume and
> > is part of the fix for bug 6828363.  Because of the divergences
> > between ICS and master, this change will need to be merged by hand.
> >
> > Signed-off-by: John Grossman <johngro@google.com>
> > Change-Id: Ica6f5e37e13d13dde60463966f41f271ffa104fd
>
> Change-Id: I5e7aea6d7da0012dcc077281f9077fc04cfb9889
> Signed-off-by: John Grossman <johngro@google.com>

Change-Id: I2011cc5bc41ca7081ce255a4bfba65f36f899bc4
Signed-off-by: John Grossman <johngro@google.com>
2012-08-07 15:59:07 -07:00
Jesse Hall
f9d6cd7dee Add multi-display and flip fence to HWC
Change-Id: I3b0446050648e2b386ffb32976c9943b6fd9793d
2012-08-07 12:26:59 -07:00
Jesse Hall
85ab59a147 Revert "Add multi-display and flip fence to HWC"
This reverts commit 1d51b2b9fc713da6de18117bc19508ecdfde4f23

Change-Id: I1ae46d8cae1cb3064800cd24df56347b05eb6059
2012-07-31 12:16:24 -07:00
Jesse Hall
65bed1f947 Add multi-display and flip fence to HWC
Change-Id: I31b4fc293220bc51169971df93347dd35fdc30ef
2012-07-30 16:52:21 -07:00
Ed Heyl
d294b9ffa1 Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev 2012-07-26 13:47:35 -07:00
Glenn Kasten
d72e517056 Merge "Add comment" 2012-07-25 15:46:14 -07:00
Glenn Kasten
e57a2d2ec6 Add comment
Change-Id: Idc2890ebc10c0e6a116bc7c8872cd379e1cf3e25
2012-07-25 14:57:16 -07:00
Glenn Kasten
48915acb39 struct effect_descriptor_s const correctness
Also struct audio_stream in audio_stream_frame_size

Change-Id: Ie0de708e38a1850c186a8b4eb5f491adc44b3275
2012-07-24 07:53:14 -07:00
Eino-Ville Talvala
d2e7c834c7 Merge "Add camera gralloc usage flags." 2012-07-17 14:11:14 -07:00
Eino-Ville Talvala
7797d75b12 Add camera gralloc usage flags.
GRALLOC_USAGE_HW_CAMERA_WRITE is for camera outputs in the new camera HAL.

GRALLOC_USAGE_HW_CAMERA_READ is for sending previously captured camera
data back into the camera pipeline for further processing. For
example, for converting a raw sensor image into YUV or JPEG data.

Bug: 6243944
Change-Id: If9011ec320a1a804f3337704243ed7fc410fec91
2012-07-16 14:50:50 -07:00
Colin Cross
38fccf483b hwcomposer: add a new blank operation
Add a new blank operation to be called by surfaceflinger when the screen
turns on or off.  Also rev the API version to 1.1 for the new field.

Change-Id: I266fb33f66184538e34cfc319f63cf809dcb2f18
2012-07-13 15:49:04 -07:00
Naseer Ahmed
88ef190fcf hardware: Add field for number of framebuffers supported
Change-Id: Iec29018a956d2c048ce077c48fd3995a4ca6f72a
2012-07-09 22:09:13 -07:00
Glenn Kasten
a635449697 Use audio_channel_mask_t consistently
Change-Id: Ib832c0b707b1e0b82adf4ab3d4d18a2dc459d240
2012-06-25 10:45:43 -07:00
Jesse Hall
d479ad22a0 Introduce HWC_DEVICE_API_VERSION_1_0
The new version adds an acquire and release fence to each layer,
providing explicit producer->hwc and hwc->producer synchronization.

Change-Id: Ibd6e3c7b3515c012c767246e6d6514274fdef01d
2012-06-18 15:53:25 -07:00
Eino-Ville Talvala
74d793867e Merge "Camera2: Add JPEG capture test." 2012-06-14 08:38:13 -07:00
Eino-Ville Talvala
fa7a91d3d2 Camera2: Add JPEG capture test.
Bug: 6243944
Change-Id: Ifdf16f34b13df1e5bfe501eb7e6083862c71240a
2012-06-13 12:02:00 -07:00
Glenn Kasten
90b429d56b am 34afb68c: Add screen state parameter
* commit '34afb68c0cd1de315f0250f6a95b9dba234133ae':
  Add screen state parameter
2012-06-08 10:57:52 -07:00
Glenn Kasten
34afb68c0c Add screen state parameter
Change-Id: Iead23e0d91dac34d40e9e55f525916b73c31bcb5
2012-06-08 10:49:34 -07:00
Eric Laurent
762ce0423f am 41eeb4fe: audio HAL: add definitions for capabilities query
* commit '41eeb4fe9f0a043dc207111893dbea26827217a6':
  audio HAL: add definitions for capabilities query
2012-06-05 09:55:29 -07:00
Eric Laurent
41eeb4fe9f audio HAL: add definitions for capabilities query
Added definitions for querying supported channel masks, sampling rates and
format with out_get_parameters().

Change-Id: Icb28fcef504c7e0a0b2daeb1bc7e704d20d3b738
2012-06-04 14:18:16 -07:00
Eino-Ville Talvala
08a6e5e374 I am a HAL of constant structure.
Bug: 6243944
Change-Id: I126313f75f5f7165d3ca96f52054866c4fb6bee0
2012-05-17 17:54:56 -07:00
Eino-Ville Talvala
407a8eeeec Merge "Camera2: Add test for construct_default_request." 2012-05-16 11:55:29 -07:00
Mathias Agopian
b21b3acf68 am e291f71e: split hwcomposer.h
* commit 'e291f71e0a25ac9bb39fb754c599b710ab8f59d5':
  split hwcomposer.h
2012-05-15 11:43:04 -07:00
Eino-Ville Talvala
6adfd6b8ce Camera2: Add test for construct_default_request.
Bug: 6243944
Change-Id: I59b03d7ebece2a4b7672b265bd9f960b3faea621
2012-05-14 15:27:00 -07:00
Mathias Agopian
e291f71e0a split hwcomposer.h
hwcomposer_defs.h now contains enums, which are essentially names.
This won't change when we rev the h/w composer API (new ones will be added instead).

we do this to avoid having to abstract all these constants in higher
level APIs; instead hwcomposer_defs.h can be included without exposing
the hwcomposer's data structures (which are a lot more fragile wrt.
backward compatibility)

Change-Id: Ifb514f64de02a599fdd2d31c188327209ccb0ffc
2012-05-13 22:49:06 -07:00
Eino-Ville Talvala
567b4a24fa Substantial cleanup of camera2 HAL, and some initial unit tests
- Clean up const/struct usage in HAL
- Add user pointer to notify callback
- Revamp allocate_stream, now it picks its own ID.
- Much simpler stream interface
- Merged request/reprocess input queues
- Frame queue interface no longer a mirror of request queue
- Added triggers/notifications
- Added default request creation
- Lots of comments

Unit tests added:

- Lots of utility code to speed up test writing
- Basic open/close
- Capturing 1 raw buffer (request input, frame output, buffer output)
- Capturing a burst of 10 raw buffers

Bug: 6243944
Change-Id: I490bd5df81079a44c43d87b02c9a7f7ca251f531
2012-05-08 17:30:56 -07:00
Todd Poynor
bcdb4cd34b hardware: Power HAL: Add POWER_HINT_INTERACTION
Change-Id: I9b2c29eadc60e2bea2f01b3925ad6a8539ec2655
2012-05-03 16:04:41 -07:00
Jamie Gennis
6b7adef0ef hwcomposer: clarify vsync timestamp meaning
This change clarifies the meaning of the HWC vsync timestamp to specify that
the timestamp must be relative to the system monotonic clock.

Change-Id: I4386ce90511fd5b8f8e988917da637d84d86f026
2012-04-30 12:57:11 -07:00
Mathias Agopian
5cb1de89a9 add version number to power HAL
Change-Id: I6acf4523b5878565035ea6c85bddd58f9b20ef1b
2012-04-26 19:49:40 -07:00
Todd Poynor
2f143fba74 hardware: libhardware: Power HAL add power hints -- DO NOT MERGE
Change-Id: I8ab0376e4f5d8ef09d5b1062cbfbb30c30c5bb96
Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-04-25 18:16:40 -07:00
Mathias Agopian
eb67160b99 fix typo in documentation
Change-Id: I2c55034c25edd466180cd9c5718c2ad568aeedff
2012-04-24 15:42:37 -07:00
Eric Laurent
da4b0b26d1 rename audio policy output flags.
Change-Id: I965fa9bcba45f223f2f2cbc4adccfb5491414c8b
2012-04-18 13:58:44 -07:00
Eric Laurent
55786bcf3c audio: updated audio HAL device API
Modified open output and input stream functions to add new
parameters needed by audio HAL. Also grouped parameters
in a config structure for clarity.

Change-Id: I60832d8e5b5e4a48f209a6d83f5ca9c044be61f1
2012-04-17 16:02:48 -07:00
Eino-Ville Talvala
0c8e630ad6 Merge "Revise camera HAL 2, and add unit test skeleton." 2012-04-17 08:57:44 -07:00
Eino-Ville Talvala
fed0c0244b Revise camera HAL 2, and add unit test skeleton.
- Add missing method in stream_ops (set_buffers_geometry)

- Remove extra method in stream_ops (set_swap_interval)

- Document metadata queue protocol

- Change metadata queue methods to be set/get through function calls
  only, instead of a struct member in the HAL device ops.

- Change vendor extension tag query methods to be retrieved by a get
  call, instead of a struct member in the HAL device ops.

- Add basic gtest unit test skeleton, which currently just returns
  static info from all camera devices.

Change-Id: I94117097b0243023ad60638070cc7f0cefec18e6
2012-04-11 11:23:31 -07:00
Mathias Agopian
6d3fec70d8 improve hwc VSYNC documentation
Change-Id: I5820d8fa183701ebbc0a825cf27bd0004b47d62e
2012-04-10 21:22:28 -07:00
Eric Laurent
c65a2fe392 audio policy: load audio hw modules.
Added methods to audio_policy_service_ops to load an audio hw module.

Added methods to open an output or input stream on a particualr module.

Change-Id: Ia0618053bec9978c1b7d2a5f6c02b78209557256
2012-04-03 19:47:04 -07:00
Mathias Agopian
d126b910ab Merge "add support for VSYNC events in h/w composer HAL" 2012-04-03 19:10:25 -07:00
Eric Laurent
b934784bbe Merge "audio: added definitions for audio HAL modules" 2012-04-03 16:46:46 -07:00
Eric Laurent
431fc78c11 audio: added definitions for audio HAL modules
Change-Id: I16f8b42ab5de503d38086413b83e934ac9aa1f24
2012-04-03 16:01:17 -07:00
Mathias Agopian
b08d45dff6 add support for VSYNC events in h/w composer HAL
Change-Id: Ic19a41ae522a236f45957e50c792934d987b116a
2012-04-03 11:45:41 -07:00
Glenn Kasten
0cacd8d44b Update comments
Change-Id: I123d9baeceda13608cc01eda6a19e13822258dc0
2012-04-01 13:43:02 -07:00
Dima Zavin
e8da6bf1cc Merge "hardware: add some guidance on providing version defines" 2012-03-30 11:58:04 -07:00
Eino-Ville Talvala
e911e4c160 Merge "Add specific version number constants to Camera HAL." 2012-03-27 16:50:18 -07:00
Eino-Ville Talvala
ddc026e393 Add specific version number constants to Camera HAL.
These constants should be used by HAL implementations to indicate
which versions of the module and device APIs they support.

Change-Id: I4b6eae278481545694e6a1827833b5958c26720c
2012-03-27 16:15:25 -07:00
Dima Zavin
2fe3ae5ec9 hardware: add some guidance on providing version defines
Change-Id: I456cb209bc5d5eb739b6fd2e2f3e869caa363ff0
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-26 23:14:15 -07:00
James Dong
89c8a6df0e Merge "Fixed an incorrect path for the include header file in a comment" 2012-03-26 17:47:50 -07:00
Kenny Root
6be478050f Merge "keymaster: add flags for keymaster features" 2012-03-26 16:42:39 -07:00
James Dong
d0ca70d834 Fixed an incorrect path for the include header file in a comment
Change-Id: I9c6f76279b54c2de66a31f751afc9222c345eb47
2012-03-26 16:32:23 -07:00
Kenny Root
3c338f4731 keymaster: add flags for keymaster features
The first flag is something for the default implementation to use to
indicate that its keys are importable to hardware keymasters. This
allows easy migration from the default software implementation to
hardware implementations as they become available.

Change-Id: Ideb26a4b1ac91ca8c330a4fe4df323f028b2f855
2012-03-26 16:21:07 -07:00
Kenny Root
6c64e73772 Merge "Add delete_all to keymaster API" 2012-03-26 14:54:22 -07:00
Kenny Root
8ae65e7199 Add delete_all to keymaster API
In order to aid keymasters erase their memory efficiently, introduce new
delete_all API to tell keymasters to forget everything. This will be
triggered when keystore itself is told to reset.

Change-Id: I730375f1f32cd1ea0bf1fa38d5b1bec2f81ba492
2012-03-26 13:26:05 -07:00
Mathias Agopian
81c323dd54 improve HWC versioning
Change-Id: Ieb50629f23c0d2b7af12c5541a8278a0979d2ee4
2012-03-25 01:11:43 -07:00
Mathias Agopian
eb8fb50814 add support for setting the background color
this is a revision of the h/w composer API. This change
is binary backward compatible.

Change-Id: Id4cf43447594db9049f7e2c44ea08157ca725129
2012-03-24 15:29:07 -07:00
Eino-Ville Talvala
daacbf4016 Fix camera2.h header.
Change-Id: Ibcc93279da2180743d7bbe2561f2bf10879ae08e
2012-03-22 13:09:56 -07:00
Eino-Ville Talvala
8bf364ef20 Reorganize camera HAL, and add versioning support.
Includes a draft of camera device HAL 2.

Change-Id: I5f56a8c54a33d0ca039360185822a9c22436cab8
2012-03-21 17:34:33 -07:00
Dima Zavin
02a5801af9 hardware: add hardware_device_api_version() macro
Change-Id: I79c4d65f6bab227364d5f271df9bd7bc565857c2
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-21 13:35:49 -07:00
Dima Zavin
65820e4d7a libhardware: add current HAL version and a module version macro
Change-Id: I30c67a6c5231f8b270b57f78bd6322c201b90859
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-20 23:23:06 -07:00
Dima Zavin
8dc4e710c0 hardware: provide temp version defines for source compatibility
This allows all the existing modules to have source level
compatibility until they are fixed to use the new field names.

Since the binary compatibility has not been altered, we do not
need to force all the implementors to rev their version numbers.

This change should be reverted when all the clients have been updated.

Change-Id: Ie543d3a972d8abe03ca5123e3000966f048d1771
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-20 12:30:20 -07:00
Dima Zavin
2b57780d88 hardware: rename version_major/minor to module/hal api version
The previous names and documentation were not clear as to how the
version fields should be used. As a result, they were often either
unused or used improperly.

It became clear that there were two version fields necessary. One
to version the implementing module and the other to version the
hw_module_t interface itself.

This change renames version_major and version_minor members of
hw_module_t to module_api_version and hal_api_version. It also
provides in-depth descriptions for all the fields and clarifies
the purpose of the version field in hw_device_t structure.

Change-Id: I3e33e5a922cdc17c5e3b1c30a00e211394f18e86
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-20 12:30:16 -07:00
Kenny Root
b2959a49be Merge "Update keymaster API to final signing spec" 2012-03-13 13:11:09 -07:00
Kenny Root
9271d04d88 Update keymaster API to final signing spec
Switch from unspecified encoding for import of keys to PKCS#8 (Java
standard encoding).

Add function for obtaining the public key from a keypair.

Add fields for RSA key generation that indicate modulus size and desired
public exponent.

Add in placeholder fields for possible digest and padding types for
signatures. Currently the only thing supported is "none" and "none"
respectively.

Change-Id: I19ee02cf35321aee859e2460a963c7213791414b
2012-03-13 13:03:22 -07:00
Rakesh Goyal
a776bb2e81 am 6d2bc4fc: am 4cbd62c2: add i2c_device_address member to nfc_pn544_device_t
* commit '6d2bc4fc11ca04326eaf982f97d13d6410a73af2':
  add i2c_device_address member to nfc_pn544_device_t
2012-03-09 11:43:56 -08:00
Rakesh Goyal
4cbd62c2ca add i2c_device_address member to nfc_pn544_device_t
Add I2C slave address. Multiple I2C addresses are possible
for PN544 module. Configure address according to board design.

Change-Id: I847e8f3db631f5039cf15143a9982f4b9b209f27
2012-03-09 08:51:15 -08:00
Eric Laurent
83c62ce4e3 audio policy: use audio_devices_t when appropriate
Change-Id: Iee57cf5c3bdfefd981e1ed5958df10171f8716e6
2012-03-08 13:45:03 -08:00
Eric Laurent
a70c5d0caf audio HAL : added string for A2DP address
Added a definition for A2DP sink address parameter.
It was previously defined at several places.

Change-Id: I757208e99db395f3d88c17e0de5ae303c71a85ec
2012-03-07 18:59:47 -08:00
Jean-Michel Trivi
a9a5f5d57f Update comments to reflect audio channel mask type name change
Replace references to "audio_channels_t" by "audio_channel_mask_t"

Change-Id: If779a4c24e40c0fcdab8376b479bd20040d686da
2012-03-05 11:44:30 -08:00
Mathias Agopian
d543b8ae4a Merge "HWComposer: update the hwc_layer::handle docs" 2012-02-20 22:51:15 -08:00
Todd Poynor
c5d3811864 Merge "Power HAL: Add initial header file and default/legacy implementation" 2012-02-17 20:23:21 -08:00
Todd Poynor
c82792c0a4 Power HAL: Add initial header file and default/legacy implementation
Change-Id: I43a515a8ffe72a9c4e7d5f7470a5e73e76d5e1b1
Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-02-17 16:26:32 -08:00
Kenny Root
60d0e5f24b Add hardware API for key handling
Add a hardware API for key handling from "keystore"

Change-Id: I5fd192cc212dbb057ee2a7003d602382ee2cd2c0
2012-02-16 15:22:27 -08:00
Mike J. Chen
5ad38a901d Modifications to audio_hal for Android@Home.
This is a squashed merge of the following changes:

Commit f560da61a5e128ca9f82f7fe939afcf1f09188c7
Author: John Grossman <johngro@google.com>
Date:   Thu Aug 11 15:34:55 2011 -0700

    Fill out a missing entry in the audio HAL function table.

    The entry for get_initial_master_volume was missing from the non-legacy audio
    HAL and needs to be filled out.  Also fix up the order of the comments
    describing the get_initial_master_volume method.

    Change-Id: I87d5415ef92611497a6dab4c657fc00367c4d80b

commit cea82facb63fd237a4ea6fb770605fcb500850ff
Author: Jason Simmons <jsimmons@google.com>
Date:   Thu Jun 16 14:24:24 2011 -0700

    Define a replacement for getSampleDelta that returns a DMA start time and count of samples queued

    Change-Id: I2d13f57b5a8c5b97fb3aa0a90834ce91c56864ef

commit 60a9acd7eee470a8d870218e8be618bfa3be15a5
Author: Mike J. Chen <mjchen@google.com>
Date:   Tue Jun 7 09:13:23 2011 -0700

    Add Android@Home extensions to new Audio HAL interface.

    Change-Id: I3ea4676d4b7d2afd78a5a7a7003ad5c437276d05
    Signed-off-by: Mike J. Chen <mjchen@google.com>

Change-Id: I09f3756d12a1ce4f9af39610ed857890742a72df
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>

Conflicts:

	include/hardware/audio.h
	modules/audio/audio_hw.c
2012-02-10 08:58:32 -08:00
Mike J. Chen
ad255ee424 Add a HAL representing a system-wide local time counter.
This is a squashed merge of the following changes:

commit 9def1ae65f6b4d6a8fdec147fdcd34f22f08174a
Author: John Grossman <johngro@google.com>
Date:   Fri Aug 12 11:47:20 2011 -0700

    Change the signature of set_local_slew.

    Changed the definition of the slew function in the local time HAL to take an
    int16 instead of an int32 and to use the full range of the int instead of
    attempting to imply any particular PPM range.

    Change-Id: Ia67f50e77f1fe674a63ec69460e830d1191ef5a0

commit afab51327453d1bfc7423f8ce7a28933d8fc49b2
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 17:29:07 2011 -0700

    Remove "primary" from the local_time HAL.

    Interface instances are a pattern which should only be used by audio.  Remove
    its use from the local_time HAL.

    Change-Id: If4c458cf16a02d9dc63c04185111ae793fc57801

commit 1c26e59a66e75ccb31027f42183aaa32bde6e456
Author: John Grossman <johngro@google.com>
Date:   Fri Jun 17 14:19:24 2011 -0700

    Refactor the local/common clock services.

    This change is one of a set of 5 changes made to different repositories.  Look
    for this comment in all of them.

    Refactor the local/common clock services to match android best
    practice.  Notable changes include

    + The kernel no longer knows anything about common time.  Common time has been
      moved completely up into user land.  This has an impact on the accuracy of the
      timesync debugging code, and the netfilter assisted approach to network based
      timesync is going to have to be modified.
    + The timesync driver used by A@H is now just local time driver.
    + The kernel no longer needs access to the linear transform math code, and it
      has been removed.
    + A new HAL has been introduced to expose the concept of local time to the
      system.
    + A non-slewable stub implementation of the local time HAL based on
      CLOCK_MONOTONIC has been added.
    + The old library has been eliminated.  Its functionality has been
      distributed among the common time binder service, the local time hal and the
      linear transform utility code.
    + All clients of the old library have been changed to be clients of
      the binder service, the hal and the utility code.
    + The reset_tt utilities have been removed, they no longer have a purpose in the
      system.

    Change-Id: I39843b94f9b6d13f63b22145a2edcafe4ca87349

Change-Id: Ib264c992d564b99ef7c7847a788e4fa7f5e101b4
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>

Conflicts:

	modules/Android.mk
2012-02-10 08:57:16 -08:00
Glenn Kasten
bfb28ccfc6 Merge "Effect UUID inputs passed by pointer are const" 2012-02-08 09:37:49 -08:00
Glenn Kasten
2be4db4a95 Merge "Use audio_in_acoustics_t consistently" 2012-02-03 08:31:11 -08:00
Glenn Kasten
75a8b8f949 Effect UUID inputs passed by pointer are const
Change-Id: I3ef6d83ae539aef32f2a251660b2e2f9646eace5
2012-01-30 11:26:28 -08:00
Glenn Kasten
114c2fd2d3 Use audio_in_acoustics_t consistently
Change-Id: Id49ad9631092db8c9ace0f45db918f708b0b32e9
2012-01-27 12:51:17 -08:00
Glenn Kasten
ae2e42b244 Use audio_source_t consistently
Change-Id: Ie25ddeb091646b7e24149b3b23a18ce0807e1891
2012-01-26 16:47:25 -08:00
Glenn Kasten
ea84c55f2c Merge "Use audio_format_t consistently" 2012-01-20 14:50:29 -08:00
Eino-Ville Talvala
7c50e9bad4 Add timestamp control to camera preview stream operations.
At higher levels, SurfaceTextures include timestamp information in
their buffers. For accurate timestamps, they need to be set by the
driver code. This change adds the needed method into
preview_stream_ops.

Timestamp behavior is documented in SurfaceTexture.java, and
system/core/include/window.h, as well as here.

Bug-Id: 5081132
Change-Id: Id285f8e26edecf605444bc4b9e6eea9b224f9d31
2012-01-20 13:40:21 -08:00
Glenn Kasten
080a80212b Audio policy HAL set_ringer_mode is deprecated
Change-Id: If0f82d5c1cb9a0faf70f5a8434f68cdc39784ee6
2012-01-18 15:15:07 -08:00