Commit graph

1200 commits

Author SHA1 Message Date
Kenny Root
4223cc3cdf am 474cbcbb: am c124b23f: keymaster: use new version fields in hw_module
* commit '474cbcbb2ed5bebcd2c5f45cbba6a163e9265742':
  keymaster: use new version fields in hw_module
2013-09-05 00:32:39 -07:00
Kenny Root
474cbcbb2e am c124b23f: keymaster: use new version fields in hw_module
* commit 'c124b23f94a0a88e872253720c0e27594a9a9938':
  keymaster: use new version fields in hw_module
2013-09-05 00:30:25 -07:00
Kenny Root
c124b23f94 keymaster: use new version fields in hw_module
The original version of this HAL used a field in keymaster_module to
represent the module's version number, but a later revision of the HAL
interface added a distinguisher between HAL module and device versions.
This is needed to support upgrade code in keystore.

Bug: 10600582
Change-Id: Ied34cf382e2b7725e648faada00df2dee993e6c5
2013-09-04 22:17:56 -07:00
Kenny Root
5e1508b88f am 76b73a39: am 2541a0a8: Add support for DSA and ECDSA key types
* commit '76b73a39e39f1dd965d2ed685bbdf36403e0356a':
  Add support for DSA and ECDSA key types
2013-09-03 10:34:46 -07:00
Kenny Root
76b73a39e3 am 2541a0a8: Add support for DSA and ECDSA key types
* commit '2541a0a8f7a2c86658d435efb49843a88b4d97e0':
  Add support for DSA and ECDSA key types
2013-09-03 10:32:05 -07:00
Kenny Root
2541a0a8f7 Add support for DSA and ECDSA key types
(cherry picked from commit 6e1683f5d5)

Bug: 10600582
Change-Id: I8e5b66baa70b37031198260853bb5355df75e23d
2013-09-03 00:52:48 -07:00
Kenny Root
886578b323 am a928d816: am bd5015e0: Merge "Add support for DSA and ECDSA key types"
* commit 'a928d816a4a7410cd18f114f6d0ad1837e07bdd2':
  Add support for DSA and ECDSA key types
2013-09-03 00:16:54 -07:00
Kenny Root
a928d816a4 am bd5015e0: Merge "Add support for DSA and ECDSA key types"
* commit 'bd5015e0f3b79d8b8e7f9b1926bbf76985ac8c61':
  Add support for DSA and ECDSA key types
2013-09-03 00:14:20 -07:00
Kenny Root
bd5015e0f3 Merge "Add support for DSA and ECDSA key types" 2013-09-03 07:11:08 +00:00
Kenny Root
6e1683f5d5 Add support for DSA and ECDSA key types
Change-Id: I4b7d11c0915c716a0f1be65f5933f33a36e0fb4b
2013-09-03 00:09:18 -07:00
Glenn Kasten
1c06c82f19 am 5dae225d: Merge "get_presentation_position" into klp-dev
* commit '5dae225de7b5ccf965d1496bc4343828a250f788':
  get_presentation_position
2013-08-29 17:08:09 -07:00
Glenn Kasten
5dae225de7 Merge "get_presentation_position" into klp-dev 2013-08-30 00:02:57 +00:00
jpadmana
45e6939f7d am 935799d6: Addition of EFFECT_CMD_OFFLOAD for effects offload
* commit '935799d63f0d654f350a640001077616572a4b63':
  Addition of EFFECT_CMD_OFFLOAD for effects offload
2013-08-29 14:09:31 -07:00
Glenn Kasten
e25f9ed346 get_presentation_position
Change-Id: Iedc4df9018321d7273eaa862e913ad6d9a844618
2013-08-29 12:05:12 -07:00
jpadmana
935799d63f Addition of EFFECT_CMD_OFFLOAD for effects offload
Added EFFECT_CMD_OFFLOAD command to audio effect control
interface. It is used by the framework to indicate if
the playback thread the effect is attached to is offloaded
of not.

Added effect flag EFFECT_FLAG_OFFLOAD_SUPPORTED indicating if
the effect implementation supports offloading to a DSP.

Change-Id: I26553576657d3aa9cd0cdcd5785c813b02f48136
Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
2013-08-28 17:52:03 -07:00
Glenn Kasten
d5335304d9 am 59caeb14: Merge "Fix file permissions" into klp-dev
* commit '59caeb14a7cb7cbc74db725343922c81f0e2e3aa':
  Fix file permissions
2013-08-22 15:32:00 -07:00
Glenn Kasten
59caeb14a7 Merge "Fix file permissions" into klp-dev 2013-08-22 22:26:35 +00:00
destradaa
9c9c541c8a am 69e82d2d: Merge "Fix typo in FlpHal" into klp-dev
* commit '69e82d2df615b77ff868309b8f2c0323eadb42c5':
  Fix typo in FlpHal
2013-08-22 12:43:20 -07:00
destradaa
69e82d2df6 Merge "Fix typo in FlpHal" into klp-dev 2013-08-22 19:37:11 +00:00
Eric Laurent
c49aa8d4f3 am 9595f7cf: remote submix: fix test on sampling valid rates
* commit '9595f7cff6ddbeb58350fadeaf21da3f14fb76bc':
  remote submix: fix test on sampling valid rates
2013-08-22 12:09:08 -07:00
Eric Laurent
9595f7cff6 remote submix: fix test on sampling valid rates
Change-Id: I4e9e378940bb56202a6e6882f561b3293ad7225d
2013-08-22 10:25:22 -07:00
destradaa
06b77aa4e1 Fix typo in FlpHal
Change-Id: I0a0598c4755052e071d793fbacf0aa25dfca6e5c
2013-08-21 12:41:19 -07:00
Glenn Kasten
08708c5e1f Fix file permissions
Change-Id: Iffc2941d98ee16796cf3d44dec1cfa376d9362bb
2013-08-20 12:49:27 -07:00
Mathias Agopian
0370e93286 am 5ba249e3: Merge "Define a range for device specific sensors" into klp-dev
* commit '5ba249e34a3840881a03e545ffba77cde5bf28ba':
  Define a range for device specific sensors
2013-08-19 16:06:51 -07:00
Mathias Agopian
5ba249e34a Merge "Define a range for device specific sensors" into klp-dev 2013-08-19 22:59:16 +00:00
Mathias Agopian
1599ec6755 Define a range for device specific sensors
Bug: 9551417
Change-Id: I5412d9c063743a0e99e8839a0758337c72a8725e
2013-08-19 14:41:12 -07:00
Zhijun He
fffed45e21 am a7ff78d4: Merge "Camera2 Tests: Add multiple stream tests" into klp-dev
* commit 'a7ff78d4edb046cfc106e450ad0733775aa22e22':
  Camera2 Tests: Add multiple stream tests
2013-08-19 14:07:07 -07:00
Zhijun He
a7ff78d4ed Merge "Camera2 Tests: Add multiple stream tests" into klp-dev 2013-08-19 21:03:22 +00:00
Zhijun He
8ef0144a52 Camera2 Tests: Add multiple stream tests
Add a test to test multiple stream configuration: one preview stream, one small
size YUV burst capture stream, and one large size YUV burst capture stream.

Also cleanup the code.

Bug 10325342

Change-Id: I676484cc0034055caa8f2a8788100ed34b4cefbb
2013-08-19 12:43:19 -07:00
Matthew Xie
9386bdf0f7 am aaf337dc: Merge "Add support for AbsoluteVolume" into klp-dev
* commit 'aaf337dccb23f04ed4a59f2f371326c93cb5c96f':
  Add support for AbsoluteVolume
2013-08-18 12:50:59 -07:00
Matthew Xie
aaf337dccb Merge "Add support for AbsoluteVolume" into klp-dev 2013-08-18 19:46:01 +00:00
Jesse Hall
de14c82906 am fc0ff2a8: Add HWC_DISPLAY_VIRTUAL and adjust display count constants
* commit 'fc0ff2a8700eb11aef7a961b279d846c8a1c04c5':
  Add HWC_DISPLAY_VIRTUAL and adjust display count constants
2013-08-17 21:35:22 -07:00
Satya Calloji
fe9728dfa1 Add support for AbsoluteVolume
Add support for AbsoluteVolume in HAL

bug 9595622

Change-Id: Iaf08b81b61aa07ebaa83f4bd6cc9e82171947aa1

Conflicts:
	include/hardware/bt_rc.h
2013-08-16 12:32:55 -07:00
Jesse Hall
fc0ff2a870 Add HWC_DISPLAY_VIRTUAL and adjust display count constants
Both surfaceflinger and HWC implementations have been defining these
themselves, making future changes more difficult. Better to define
them centrally, where they can be updated easily.

Change-Id: I793158b858c84b2470b05f9ea77cc5a0c7e247f1
2013-08-16 11:13:36 -07:00
John Du
cd15c2cce2 am b9844811: Add support for ff/rew
* commit 'b98448119351df9ec7453e0ae92ea408b02294db':
  Add support for ff/rew
2013-08-15 14:58:18 -07:00
John Du
b984481193 Add support for ff/rew
Change-Id: I95d17aa4f54d58596085f8d67e63e277b280a242
(cherry picked from commit a068b57857a6f9f2db335dbb18f1be37e85937c6)
2013-08-15 18:48:47 +00:00
Andre Eisenbach
6481266b17 am 299e43c1: LE: Add peripheral role support (3/4)
* commit '299e43c186a9c8a6611d8c5f61d158436948afe5':
  LE: Add peripheral role support (3/4)
2013-08-14 08:16:02 -07:00
Andre Eisenbach
d1d76ba204 am 02223d16: LE: Add instance ID to descriptors (3/4)
* commit '02223d1602c1728b3c94f68059d1b2e76d35dbd3':
  LE: Add instance ID to descriptors (3/4)
2013-08-14 08:16:01 -07:00
Andre Eisenbach
299e43c186 LE: Add peripheral role support (3/4)
Initial stack support for the LE peripheral role.

Change-Id: Ie036432c90c405a331e2fceaf88bf97a46182176
2013-08-14 00:53:11 -07:00
Andre Eisenbach
02223d1602 LE: Add instance ID to descriptors (3/4)
If a remote devices offers multiple descriptors with the same UUID, the
instance ID is used to differentiate between them.

Change-Id: Ia5ab989f222a5cf1b7cb66966ad4f91f2b660708
2013-08-13 19:35:15 -07:00
Glenn Kasten
30c53abeea Merge "Fix typo and remove executable bit on source code files" 2013-08-12 17:07:30 +00:00
Zhijun He
6e548cf960 Camera2 tests: Fix a typo of a test check
Change-Id: Ib47eba8d01e93d0c3ce2b1e8bc2ff638529e32f9
2013-08-08 19:48:56 -07:00
Mathias Agopian
af32a8d594 minor changes to sensor HAL interface
Change-Id: Idc415fd0a92482f4f4cd051b458a28d97f251f35
2013-08-06 20:33:38 -07:00
Mathias Agopian
3f4fe31075 Merge "improvements to the batch mode APIs" 2013-08-06 23:29:17 +00:00
Mathias Agopian
3321f1b709 Fix build, 2nd attempt
Change-Id: Iaa86a6888a5ccf784b13f4c3b2d8dc4813612155
2013-08-06 14:22:12 -07:00
Mathias Agopian
ef18cb7133 Fix build.
Change-Id: Ibf73106f8be63cf433fafe9510c8477f74b7ac41
2013-08-06 14:17:59 -07:00
Mathias Agopian
16671c5519 improvements to the batch mode APIs
- also added a flush() method to drain the FIFO before
  the batch timeout has expired

Change-Id: I73cc450fae0a6acf73d8b5d73bcd7a225bfbfe35
2013-08-05 17:07:02 -07:00
Eino-Ville Talvala
9d51856d71 Camera: Add new 3.1 device version
- Add new definition to camera_common
- Update comment in camera3.h

Change-Id: I9d8c594cfdaff40c543e8f9017091b0c06bbf022
2013-07-30 15:03:50 -07:00
Eino-Ville Talvala
1ba3f933c4 Merge "Camera2 tests: Update paths to camera service" 2013-07-30 17:57:56 +00:00
Glenn Kasten
6367c2ca3e Fix typo and remove executable bit on source code files
Change-Id: I0ac46bf80a4708d190c148f8b72bfcf4ea1168b1
2013-07-30 10:09:51 -07:00