OSDN Git Service
Glenn Kasten [Thu, 22 Aug 2013 22:26:35 +0000 (22:26 +0000)]
Merge "Fix file permissions" into klp-dev
destradaa [Thu, 22 Aug 2013 19:37:11 +0000 (19:37 +0000)]
Merge "Fix typo in FlpHal" into klp-dev
Eric Laurent [Thu, 22 Aug 2013 16:55:13 +0000 (09:55 -0700)]
remote submix: fix test on sampling valid rates
Change-Id: I4e9e378940bb56202a6e6882f561b3293ad7225d
destradaa [Wed, 21 Aug 2013 19:41:19 +0000 (12:41 -0700)]
Fix typo in FlpHal
Change-Id: I0a0598c4755052e071d793fbacf0aa25dfca6e5c
Glenn Kasten [Tue, 20 Aug 2013 19:48:44 +0000 (12:48 -0700)]
Fix file permissions
Change-Id: Iffc2941d98ee16796cf3d44dec1cfa376d9362bb
Mathias Agopian [Mon, 19 Aug 2013 22:59:16 +0000 (22:59 +0000)]
Merge "Define a range for device specific sensors" into klp-dev
Mathias Agopian [Mon, 19 Aug 2013 21:34:47 +0000 (14:34 -0700)]
Define a range for device specific sensors
Bug:
9551417
Change-Id: I5412d9c063743a0e99e8839a0758337c72a8725e
Zhijun He [Mon, 19 Aug 2013 21:03:22 +0000 (21:03 +0000)]
Merge "Camera2 Tests: Add multiple stream tests" into klp-dev
Zhijun He [Wed, 14 Aug 2013 00:36:17 +0000 (17:36 -0700)]
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
Matthew Xie [Sun, 18 Aug 2013 19:46:01 +0000 (19:46 +0000)]
Merge "Add support for AbsoluteVolume" into klp-dev
Satya Calloji [Thu, 1 Aug 2013 10:11:11 +0000 (03:11 -0700)]
Add support for AbsoluteVolume
Add support for AbsoluteVolume in HAL
bug
9595622
Change-Id: Iaf08b81b61aa07ebaa83f4bd6cc9e82171947aa1
Conflicts:
include/hardware/bt_rc.h
Jesse Hall [Fri, 16 Aug 2013 18:13:36 +0000 (11:13 -0700)]
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
John Du [Wed, 24 Jul 2013 00:15:34 +0000 (17:15 -0700)]
Add support for ff/rew
Change-Id: I95d17aa4f54d58596085f8d67e63e277b280a242
(cherry picked from commit
a068b57857a6f9f2db335dbb18f1be37e85937c6)
Andre Eisenbach [Wed, 7 Aug 2013 02:54:25 +0000 (19:54 -0700)]
LE: Add peripheral role support (3/4)
Initial stack support for the LE peripheral role.
Change-Id: Ie036432c90c405a331e2fceaf88bf97a46182176
Andre Eisenbach [Tue, 9 Jul 2013 07:02:48 +0000 (00:02 -0700)]
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
Zhijun He [Fri, 9 Aug 2013 02:43:24 +0000 (19:43 -0700)]
Camera2 tests: Fix a typo of a test check
Change-Id: Ib47eba8d01e93d0c3ce2b1e8bc2ff638529e32f9
Mathias Agopian [Wed, 7 Aug 2013 03:33:38 +0000 (20:33 -0700)]
minor changes to sensor HAL interface
Change-Id: Idc415fd0a92482f4f4cd051b458a28d97f251f35
Mathias Agopian [Tue, 6 Aug 2013 23:29:17 +0000 (23:29 +0000)]
Merge "improvements to the batch mode APIs"
Mathias Agopian [Tue, 6 Aug 2013 21:22:12 +0000 (14:22 -0700)]
Fix build, 2nd attempt
Change-Id: Iaa86a6888a5ccf784b13f4c3b2d8dc4813612155
Mathias Agopian [Tue, 6 Aug 2013 21:17:59 +0000 (14:17 -0700)]
Fix build.
Change-Id: Ibf73106f8be63cf433fafe9510c8477f74b7ac41
Mathias Agopian [Thu, 25 Jul 2013 04:07:40 +0000 (21:07 -0700)]
improvements to the batch mode APIs
- also added a flush() method to drain the FIFO before
the batch timeout has expired
Change-Id: I73cc450fae0a6acf73d8b5d73bcd7a225bfbfe35
Eino-Ville Talvala [Tue, 30 Jul 2013 21:58:31 +0000 (14:58 -0700)]
Camera: Add new 3.1 device version
- Add new definition to camera_common
- Update comment in camera3.h
Change-Id: I9d8c594cfdaff40c543e8f9017091b0c06bbf022
Eino-Ville Talvala [Tue, 30 Jul 2013 17:57:55 +0000 (17:57 +0000)]
Merge "Camera2 tests: Update paths to camera service"
Eino-Ville Talvala [Fri, 26 Jul 2013 00:09:14 +0000 (17:09 -0700)]
Camera2 tests: Update paths to camera service
Change-Id: Ic50ea977194073e3768c22a5f21eb15f430fa2f5
Alex Ray [Wed, 17 Jul 2013 21:23:04 +0000 (14:23 -0700)]
modules: camera: Separate locking for static characteristics
Static camera characteristics can be queried on any device at any time.
Separate the locking for it from the rest of the device to eliminate any
contention between operations on the device and static characteristic
initialization.
Change-Id: I8076378699f274e70c6318e537df4758972de9db
Mathias Agopian [Fri, 26 Jul 2013 23:23:33 +0000 (16:23 -0700)]
get rid of HAL pixelformats 5551 and 4444
Change-Id: I196ee30ed57707ed4cc46fb3a9c5c07c5bac6fff
Alex Ray [Fri, 26 Jul 2013 20:47:51 +0000 (20:47 +0000)]
Merge "camera3: Add flush"
Alex Ray [Fri, 26 Jul 2013 20:41:59 +0000 (20:41 +0000)]
Merge "camera3: Pass consumer information in configure_streams"
Zhihai Xu [Fri, 26 Jul 2013 18:28:49 +0000 (18:28 +0000)]
Merge "Add debug menu to enable btsnoop"
Eric Laurent [Thu, 25 Jul 2013 21:15:23 +0000 (21:15 +0000)]
Merge "Code changes for offload support in hardware libhardware"
Zhijun He [Fri, 19 Jul 2013 00:59:30 +0000 (17:59 -0700)]
modules: camera: Fix build break due to metadata change
Change-Id: I085796569ea77336d32907ee2287ff7533b0c122
Zhijun He [Fri, 19 Jul 2013 00:01:57 +0000 (17:01 -0700)]
Camera2Test: fix build break due to metadata change
Change-Id: I1b81f14fe0f093a7d29d0b0facdb1886d521d256
Richard Fitzgerald [Mon, 13 May 2013 15:58:54 +0000 (16:58 +0100)]
Code changes for offload support in hardware libhardware
Change-Id: Icfe9bf4b4768bbdcb11e6c77ac26163018f9c7c8
Jason Sams [Tue, 16 Jul 2013 19:52:36 +0000 (19:52 +0000)]
Merge "Add usage bit for RenderScript."
Jason Sams [Tue, 16 Jul 2013 19:51:13 +0000 (12:51 -0700)]
Add usage bit for RenderScript.
Change-Id: I3ac3dc8e20e94ee885228febdc8eeb66278054cb
Ying Wang [Tue, 16 Jul 2013 05:18:04 +0000 (22:18 -0700)]
always pass the BufferQueue explicitely to consumers
to fix tests build.
Change-Id: Ifec605926324683ac9b12b8ed3cbfb6ac02ec18c
Mathias Agopian [Tue, 16 Jul 2013 02:18:04 +0000 (02:18 +0000)]
Merge "always pass the BufferQueue explicitely to consumers"
Mathias Agopian [Sat, 13 Jul 2013 05:06:45 +0000 (22:06 -0700)]
always pass the BufferQueue explicitely to consumers
Change-Id: Ie13b251d6bfadd533fa045ec5d3299ee8ae752af
destradaa [Sat, 13 Jul 2013 00:59:03 +0000 (00:59 +0000)]
Merge "Update FLP HAL definition for thread semantics."
Eino-Ville Talvala [Sat, 13 Jul 2013 00:10:41 +0000 (00:10 +0000)]
Merge "Camera tests: Add variable burst test"
destradaa [Fri, 12 Jul 2013 23:18:12 +0000 (16:18 -0700)]
Update FLP HAL definition for thread semantics.
Change-Id: I3dd1f5c72f0fa62a131b7ce166f3df631bb44394
Eino-Ville Talvala [Tue, 2 Jul 2013 01:47:09 +0000 (18:47 -0700)]
Camera tests: Add variable burst test
By default, this test runs through a range of application-set
exposure, frame duration, and sensitivity values, and verifies
that the duration of capture, and in some cases the brightness,
match what's expected.
Optionally, it can use environment variables to specify the
burst parameters, and to enable dumping the captured YUV images
to flash for later debugging.
Change-Id: I647d360344ef3684e99c86c369e96ac82e62fc96
Etienne Le Grand [Fri, 12 Jul 2013 16:17:52 +0000 (16:17 +0000)]
Merge "Clarify some comments in the sensor HAL"
Mathias Agopian [Wed, 10 Jul 2013 23:10:47 +0000 (23:10 +0000)]
Merge "bump HWC version to 1.3, add support for float crop rectangle"
Mathias Agopian [Wed, 10 Jul 2013 02:55:41 +0000 (19:55 -0700)]
bump HWC version to 1.3, add support for float crop rectangle
Change-Id: I8601ecc9f39052000b872805be1637ee73b0d3e1
Etienne Le Grand [Wed, 10 Jul 2013 21:08:40 +0000 (14:08 -0700)]
Clarify some comments in the sensor HAL
Step count can reset when android restarts
When calling activate() without calling setDelay() before, use a default rate
Uncalibrated magnetometer should not be low pass filtered
The accelerometer can be used for the geomagnetic rotation vector
When batching call retuns an error, it shouldn't change the state. In particular, it shouldn't change the rate.
batch(timeout=0) must always return success
Wake upon fifo full will never be specified when timeout=0
setDelay is not called when in batch mode
Change-Id: I8a437eeedbdc54e5f1f3e644a92e9f781d7add0d
Alex Ray [Tue, 9 Jul 2013 19:19:49 +0000 (12:19 -0700)]
modules: camera: simplify metadata list traversal
keep traveling pointer local to the walking loop
Change-Id: I0038007d6e7a45e519b9b2162c674132477879cc
Alex Ray [Tue, 4 Jun 2013 19:38:07 +0000 (12:38 -0700)]
modules: camera: Shutter notify message support
The shutter callback timestamp should originate from the sensor itself,
since it knows exactly when the first line of the frame started
exposing. However, as a fallback (or in the CPU-painting case) query
CLOCK_BOOTTIME instead.
Change-Id: Id57c05525e9c575d009b9deb96a69557fccac16b
Alex Ray [Tue, 9 Jul 2013 19:18:35 +0000 (19:18 +0000)]
Merge "modules: camera: make Metadata a delete-able object"
Alex Ray [Tue, 9 Jul 2013 19:18:17 +0000 (19:18 +0000)]
Merge "modules: camera: only wait on valid acquire fence"
The Android Open Source Project [Mon, 8 Jul 2013 22:52:25 +0000 (15:52 -0700)]
am
cb7f5b94: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
cb7f5b94a3d683f297ddf839ca4aa897e0927139':
The Android Open Source Project [Mon, 8 Jul 2013 22:35:35 +0000 (15:35 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I2c24ec07adc57969cc48647a07afca7337923d51
Mathias Agopian [Mon, 8 Jul 2013 22:33:54 +0000 (22:33 +0000)]
Merge "be more explicit about 64 bits values in sensor events"
Mathias Agopian [Mon, 8 Jul 2013 21:00:54 +0000 (14:00 -0700)]
be more explicit about 64 bits values in sensor events
Change-Id: I61e4832ff2c721987c38897924b1b50b758384da
The Android Automerger [Mon, 8 Jul 2013 12:55:35 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Alex Ray [Fri, 31 May 2013 23:51:39 +0000 (16:51 -0700)]
modules: camera: make Metadata a delete-able object
Metadata is currently only used for immutable persistent settings
(static camera characteristics, and the capture templates), but will be
used for dynamic metadata as well. Make it deleteable so we can
create/destroy these at will.
Change-Id: I7372b07b904d5a6b55453093712e0bb2675918b5
Alex Ray [Thu, 30 May 2013 07:19:04 +0000 (00:19 -0700)]
modules: camera: only wait on valid acquire fence
Change-Id: I4f51e509d86722c18308f4f1312ca3379cffd795
Alex Ray [Wed, 29 May 2013 22:08:29 +0000 (15:08 -0700)]
modules: camera: Write back stream parameters
max_buffers and usage are read by the framework inside the struct used
to pass the stream configuration parameters; scribble our new
calculated values whever they are updated internally.
Adds logging to stream creation method (reuse/new).
Change-Id: I04e12880820571900f2ae80c27100f8aedcf9d02
Alex Ray [Tue, 2 Jul 2013 23:56:14 +0000 (16:56 -0700)]
modules: camera: Fix stream type characterization
Type is now enum, not mask.
Change-Id: I264da26a457957a7659154e507970e0303c76e25
Alex Ray [Tue, 2 Jul 2013 22:47:24 +0000 (15:47 -0700)]
modules: camera: Dirty metadata objects on update
Change-Id: I4fbd4ad919b855168e3ff5424613271b1fa907af
Alex Ray [Wed, 29 May 2013 03:32:48 +0000 (20:32 -0700)]
modules: camera: default request templates
Change-Id: I0a4b389e1850c10e12a65b3c8a5670c78c6746f7
Eino-Ville Talvala [Tue, 2 Jul 2013 19:41:26 +0000 (12:41 -0700)]
am
43c754f4: am
4c543a14: Enable native HAL tests to work for camera3 devices
* commit '
43c754f49c0cbd31f3a067b6bff4b98829cb3811':
Enable native HAL tests to work for camera3 devices
Eino-Ville Talvala [Tue, 2 Jul 2013 19:36:39 +0000 (12:36 -0700)]
am
4c543a14: Enable native HAL tests to work for camera3 devices
* commit '
4c543a1456cd34a94e2c3a09879aa65ed8cd2f3a':
Enable native HAL tests to work for camera3 devices
Alex Ray [Tue, 28 May 2013 22:52:04 +0000 (15:52 -0700)]
modules: camera: fix compiler warnings
Change-Id: Id1aa624d377776a7e37b52978664d30c927595be
Alex Ray [Fri, 28 Jun 2013 21:07:01 +0000 (21:07 +0000)]
Merge "modules: camera: add get_camera_info support"
Alex Ray [Tue, 28 May 2013 22:52:47 +0000 (15:52 -0700)]
modules: camera: add get_camera_info support
Basic static metadata statically constructed from preprocessor passes
over an array of camera metadata tags.
Change-Id: I16ea9f4d68120d5a0bc010a4a67b0cbcd761329e
Eino-Ville Talvala [Wed, 26 Jun 2013 01:12:19 +0000 (18:12 -0700)]
Enable native HAL tests to work for camera3 devices
Change-Id: Ie11270cc8cf301ec94795b595f0517ee3bad2817
Richard Fitzgerald [Mon, 25 Mar 2013 16:11:44 +0000 (16:11 +0000)]
Add defines and support for audio offload
- Add non-blocking write support, set_callback() function
- Add pause, resume, flush, drain functions to audio output stream
- Add audio parameter defines for compressed audio metadata
- Extend audio_config_t to include an audio_offload_info_t field
- Add is_offload_supported() function to test whether there is
hardware decode support for a given compressed audio format
- Change audio_stream_frame_size() to handle offloaded streams.
For an offloaded stream the size is always counted in bytes
(frame size == 1) and the number of channels is irrelevant.
Change-Id: I5b82c3fdcfa1456502d0042888f166bf02d8d54b
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
The Android Open Source Project [Wed, 26 Jun 2013 19:37:51 +0000 (12:37 -0700)]
am
0ab04716: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
0ab04716dcb05f085edcc80bbed3ecefcbec9c46':
The Android Open Source Project [Wed, 26 Jun 2013 19:33:43 +0000 (12:33 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I645db66e377a7f385129f72507f19036d4029445
The Android Automerger [Wed, 26 Jun 2013 19:17:24 +0000 (12:17 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Iliyan Malchev [Wed, 26 Jun 2013 02:02:03 +0000 (19:02 -0700)]
am
1b8e21aa: am
1a70c0fd: libhardware: deprecate POWER_HINT_VIDEO_ENCODE/_DECODE
* commit '
1b8e21aa2d4a48c3c0777929e723817995881f70':
libhardware: deprecate POWER_HINT_VIDEO_ENCODE/_DECODE
Iliyan Malchev [Wed, 26 Jun 2013 02:00:07 +0000 (19:00 -0700)]
am
1a70c0fd: libhardware: deprecate POWER_HINT_VIDEO_ENCODE/_DECODE
* commit '
1a70c0fd39eed070c2c28fc0731fa689d15931c4':
libhardware: deprecate POWER_HINT_VIDEO_ENCODE/_DECODE
Iliyan Malchev [Wed, 26 Jun 2013 01:50:49 +0000 (18:50 -0700)]
libhardware: deprecate POWER_HINT_VIDEO_ENCODE/_DECODE
Bug:
9581070
Change-Id: Ifb47ed0d4fc201732ca6593d41317ec356ead2ba
Signed-off-by: Iliyan Malchev <malchev@google.com>
Jaikumar Ganesh [Wed, 26 Jun 2013 01:28:35 +0000 (01:28 +0000)]
Merge "Changes to fused location hardware hal."
Mekala Natarajan [Wed, 26 Jun 2013 00:02:04 +0000 (17:02 -0700)]
am
a2ce3e82: am
501fc0f1: Power: Add multimedia hints
* commit '
a2ce3e82d5b3667683f3b413e9896fa30b2a9e11':
Power: Add multimedia hints
Mekala Natarajan [Tue, 25 Jun 2013 22:11:07 +0000 (15:11 -0700)]
am
501fc0f1: Power: Add multimedia hints
* commit '
501fc0f18249468d485415a3a7f892c644271e63':
Power: Add multimedia hints
Kevin Tang [Mon, 17 Jun 2013 19:47:27 +0000 (12:47 -0700)]
Changes to fused location hardware hal.
1. Added some comments.
2. Added device context information.
Change-Id: I0db21778b60339c92b4951aee4facb1148020198
Alex Ray [Mon, 24 Jun 2013 18:28:05 +0000 (11:28 -0700)]
camera3: Add flush
Flush is used to quiesce a camera device as quickly as possible, which
can be used to deal with a pathological client (requests a frame
duration of hours then dying) as well as speed up stream configuration
changes when the outstanding requests data isn't required.
Change-Id: Ie822efae8c705bd64d63c0eab7e9c291ecb570ef
Alex Ray [Fri, 14 Jun 2013 22:09:30 +0000 (15:09 -0700)]
camera3: Pass consumer information in configure_streams
HALs seem to need to know the gralloc usage flags of the opposite
endpoint (producer/consumer) of a stream at configure time.
Instead of adding another call to pass stream information, we just
pass the usage flags in the existing usage field.
Change-Id: I745baf2c4dd9123273d811b9bd52ae68c854b70c
Mekala Natarajan [Wed, 19 Jun 2013 22:57:22 +0000 (15:57 -0700)]
Power: Add multimedia hints
Add hints for video encode and decode use cases. These
hints are sent when the relevant use case starts and ends.
Clients can also send metadata along with the hint to provide
context to the power HAL so that it can make more informed
decisions about how to tweak system-level parameters.
Bug:
9325608
Change-Id: I4731acbe50a7401a95ec9231c4e1a4795098fcd4
Signed-off-by: Iliyan Malchev <malchev@google.com>
Jaikumar Ganesh [Tue, 11 Jun 2013 21:01:37 +0000 (21:01 +0000)]
Merge "Fused Location Provider HAL interface."
Jaikumar Ganesh [Tue, 4 Jun 2013 22:43:07 +0000 (15:43 -0700)]
Fused Location Provider HAL interface.
Fused location allows for fusion of information from
multiple source like GPS, Wifi, Cell, Bluetooth, Sensors etc
to get a location. Doing this in hardware is useful because
it can be done completely in the baseband without waking up the AP.
Change-Id: Ib007839ff51b7e87e8d62f0ff9fea1c4a474b1d1
Zhihai Xu [Tue, 11 Jun 2013 03:23:45 +0000 (20:23 -0700)]
Add debug menu to enable btsnoop
bug:
8059358
Change-Id: Ib28ffe12d9b42726a0c12ecb144624862745e9ca
Alex Ray [Sat, 27 Apr 2013 02:32:29 +0000 (19:32 -0700)]
modules: camera: No-op result submission with request
Change-Id: If4e377ba0ac327cc02ac2b9765ce5d406b8960a8
Alex Ray [Fri, 26 Apr 2013 21:47:08 +0000 (14:47 -0700)]
modules: camera: Input buffer reprocessing scaffolding
Change-Id: I158ba833549aee47ca3be5673f6f5d33e455ef59
Alex Ray [Wed, 20 Mar 2013 20:20:02 +0000 (13:20 -0700)]
modules: camera: memoize request settings metadata
Change-Id: I19c3a6a55a42e60f627702cd4a995664a0dfc4d2
The Android Open Source Project [Thu, 23 May 2013 15:06:40 +0000 (08:06 -0700)]
am
94a155a4: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
94a155a41a562db983e4aa9c51bbeb39438885de':
The Android Open Source Project [Thu, 23 May 2013 15:05:38 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I31743534d947232b1cce9b36877c58d43e459d08
The Android Automerger [Thu, 23 May 2013 12:55:23 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Wed, 22 May 2013 16:22:45 +0000 (09:22 -0700)]
am
b3d4dae4: am
73dba5e0: Camera3: Document missing AF transitions.
* commit '
b3d4dae427ea06a5ef21fda013694603a1c6ebcc':
Camera3: Document missing AF transitions.
Eino-Ville Talvala [Wed, 22 May 2013 16:20:06 +0000 (09:20 -0700)]
am
73dba5e0: Camera3: Document missing AF transitions.
* commit '
73dba5e043d44910a8cee4def742f58607fc5894':
Camera3: Document missing AF transitions.
Eino-Ville Talvala [Tue, 21 May 2013 23:29:14 +0000 (16:29 -0700)]
Camera3: Document missing AF transitions.
Bug:
9075581
Change-Id: I7688cee904987f404b4ab7ff0e5212182f85a271
The Android Open Source Project [Thu, 16 May 2013 12:48:25 +0000 (05:48 -0700)]
am
9b5408ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
9b5408ffd6f6100e6a62d99983e1524c03ac1304':
The Android Open Source Project [Thu, 16 May 2013 12:43:48 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I1e981404c88dd61fe418ae799d599ae4d072555c
The Android Automerger [Wed, 15 May 2013 12:55:32 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Brian Carlstrom [Tue, 14 May 2013 22:59:22 +0000 (15:59 -0700)]
am
ee37c3a8: am
63b64337: Add larger RSA key sizes
* commit '
ee37c3a845ea1de5508ad3059457117170a8e5d5':
Add larger RSA key sizes
Brian Carlstrom [Tue, 14 May 2013 22:56:46 +0000 (15:56 -0700)]
am
63b64337: Add larger RSA key sizes
* commit '
63b64337fbaa10b282f85a7e887b40ced6d6d632':
Add larger RSA key sizes
Brian Carlstrom [Tue, 14 May 2013 22:20:28 +0000 (15:20 -0700)]
Add larger RSA key sizes
Bug:
8734191
Change-Id: I82413505b32d5cdd2c4330c63d5f66e6b7e34634
Alex Ray [Fri, 1 Mar 2013 09:32:21 +0000 (01:32 -0800)]
modules: camera: Add buffer registration scaffold
Change-Id: Ic1d20dd7f93a0ca3cd2c3af3b33a7a9df47b5e89