Commit graph

662 commits

Author SHA1 Message Date
Dima Zavin
b0bef12f79 Merge "libhardware: add current HAL version and a module version macro" 2012-03-21 10:44:43 -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
fb0e64e40b Merge changes Ie543d3a9,I3e33e5a9
* changes:
  hardware: provide temp version defines for source compatibility
  hardware: rename version_major/minor to module/hal api version
2012-03-20 12:32:17 -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
4fd0db7cd1 Add tests for keymaster API
This adds unit tests for implementors of the keymaster API. It can be
compiled and run as a stand-alone executable.

Change-Id: Id5bb8f4533b744c254b52e07df66a8d158dfda0d
2012-03-19 10:58:27 -07:00
suyi Yuan
539c9936ae remove seemed useless gralloc_open() call in fb_device_open()
Change-Id: I520e460bd558934c71042b5a4fdb03b3935ad720
Signed-off-by: suyi Yuan <yuan.suyi@gmail.com>
2012-03-15 15:27:02 +08: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
6d2bc4fc11 am 4cbd62c2: add i2c_device_address member to nfc_pn544_device_t
* commit '4cbd62c2ca1600dcd2001d1c5a736abc043a0333':
  add i2c_device_address member to nfc_pn544_device_t
2012-03-09 11:34:13 -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
Eric Laurent
d4cf73b362 Merge "audio policy: manage stream volume per device" 2012-01-17 17:34:53 -08:00
Eric Laurent
5b20536691 Merge "audio effects: add auxiliary channel feature" 2012-01-17 12:11:53 -08:00
Glenn Kasten
fad1f606a2 Merge "set_mode and set_phone_state now take audio_mode_t" 2012-01-17 11:33:22 -08:00
Eric Laurent
ca20b17b41 audio policy: manage stream volume per device
Improve volume management by keeping track of volume for each type
of device independently.

Added functions at the audio policy interface to set and get stream volume
for a particular device.

Change-Id: Ic8899e82e48193cb65b3673e9d20383efed943b5
2012-01-17 09:10:45 -08:00
Glenn Kasten
c38e7baa4f Merge "Use size_t for frame size" 2012-01-17 07:27:35 -08:00
Glenn Kasten
80eed7f096 Merge "Use audio_stream_type_t consistently" 2012-01-17 07:26:08 -08:00
Eric Laurent
66861e3740 audio effects: add auxiliary channel feature
Added API to query and configure effects supporting auxiliary channels.
An auxiliary channel contains an additional audio signal helping in the
processing of the main channel. An example is a dual mic noise suppressor
were the main channel contains the signal from the main mic and the aux channel
containss the signal from the sub mic.

Change-Id: Ibb7a19d7f492720ebad0be45f78f996e0beba272
2012-01-13 15:18:47 -08:00
Glenn Kasten
a26cbac8a0 Use size_t for frame size
Change-Id: Ib96808544ee6fd76d0c8ff42e27b9c05518e8415
2012-01-13 14:53:35 -08:00
Glenn Kasten
9fc1eaed52 Merge "Fix typo in gralloc.h" 2012-01-13 13:48:24 -08:00
Glenn Kasten
5161a847dd Use audio_stream_type_t consistently
Change-Id: I1e92f018a07e4b1b73ef8d4de461ef1e08bc48e7
2012-01-12 16:55:03 -08:00
Glenn Kasten
fe79eb3f06 Use audio_format_t consistently
Was sometimes int or uint32_t

Change-Id: Ib3d82f5aefeda371c0439e43e72737a54882f519
2012-01-12 14:55:57 -08:00
Glenn Kasten
6df641e269 set_mode and set_phone_state now take audio_mode_t
Change-Id: I12a3a5ad6c3cadc6b9de8281f78edfef53908e2d
2012-01-12 10:06:24 -08:00
Steve Block
60d056bf29 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I0cbe865d464a37365fa3be84948b07e5a0d181d0
2012-01-08 11:03:25 +00:00
Glenn Kasten
f678d47450 Merge "Add comment about actual type of set_mode" 2012-01-06 13:38:05 -08:00
Glenn Kasten
af320d7500 Add comment about actual type of set_mode
Change-Id: Ie50a66894831763b6e9eb6aa490441d7759cbeef
2012-01-05 15:34:27 -08:00
Steve Block
22d351317a Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I135fadaf10e95af1eb918889a22980c194c650ca
2012-01-05 23:27:52 +00:00
Steve Block
b224b78c14 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ia8b6f74b27098b3dba27f177a76264eb23f849ee
2012-01-04 20:07:12 +00:00
Steve Block
cee8501c16 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I98e83cc9d22f0ea8fbf397ccccd9ce7773119551
2012-01-03 22:31:17 +00:00
Jamie Gennis
9c5466b616 HWComposer: update the hwc_layer::handle docs
Change-Id: I3c1211146b2e5f84546724c86f344bd2e63bd55c
2011-12-20 14:33:52 -08:00
Eric Laurent
922f9e6e5f audio effects: rename configure command
Renamed audio effect library interface command for audio format
configuration from EFFECT_CMD_CONFIGURE to EFFECT_CMD_SET_CONFIG.
This makes the naming more consistent with other exixsting commands
and allow adding new a command to get the configuration (EFFECT_CMD_GET_CONFIG).
Same change for reverse channel configuration renamed from
EFFECT_CMD_CONFIGURE_REVERSE to EFFECT_CMD_SET_CONFIG_REVERSE.

Change-Id: I1cc462aa50e58ceec900b3da9bd3873d2d098098
2011-12-19 16:23:10 -08:00
Glenn Kasten
bb56a1007d Fix typo in gralloc.h
Change-Id: I8d989b21e10e19ae4124188f02ef84eeabdb4654
2011-12-19 09:14:19 -08:00