OSDN Git Service
Eric Laurent [Fri, 7 Sep 2012 01:07:21 +0000 (18:07 -0700)]
am
74a1cedd: Merge "audio effects: add audio source indication" into jb-mr1-dev
* commit '
74a1ceddb1634fdfb6de2770b201edc875b3dd34':
audio effects: add audio source indication
Eric Laurent [Fri, 7 Sep 2012 01:04:40 +0000 (18:04 -0700)]
Merge "audio effects: add audio source indication" into jb-mr1-dev
The Android Open Source Project [Thu, 6 Sep 2012 14:54:03 +0000 (07:54 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I67fc38f96c10401960d05d90a48c5cfeb7efbbda
The Android Automerger [Wed, 5 Sep 2012 13:34:04 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Tue, 4 Sep 2012 23:24:36 +0000 (16:24 -0700)]
am
12b7484e: Merge "Revert "Revert "Add reprocess method, redefine gralloc ZSL usage flag""" into jb-mr1-dev
* commit '
12b7484e9fde9f19d02596981e479461d0080ed7':
Revert "Revert "Add reprocess method, redefine gralloc ZSL usage flag""
Eino-Ville Talvala [Tue, 4 Sep 2012 23:22:05 +0000 (16:22 -0700)]
Merge "Revert "Revert "Add reprocess method, redefine gralloc ZSL usage flag""" into jb-mr1-dev
Eino-Ville Talvala [Tue, 4 Sep 2012 21:21:07 +0000 (14:21 -0700)]
Revert "Revert "Add reprocess method, redefine gralloc ZSL usage flag""
Missing project ready to go.
This reverts commit
536148699beffcc4e6a2ced7c41fbbc3bcfa9886
Change-Id: I101343b443be6febe160685de6d72ddbf7e6aea5
Jesse Hall [Tue, 4 Sep 2012 21:00:52 +0000 (14:00 -0700)]
am
2dc9f578: Merge "Make HWC_MODULE_API_VERSION fit in uint16_t again" into jb-mr1-dev
* commit '
2dc9f5781d79dbab9c4f7ce1122944ba0442960e':
Make HWC_MODULE_API_VERSION fit in uint16_t again
Jesse Hall [Tue, 4 Sep 2012 20:59:19 +0000 (13:59 -0700)]
Merge "Make HWC_MODULE_API_VERSION fit in uint16_t again" into jb-mr1-dev
Eino-Ville Talvala [Tue, 4 Sep 2012 19:29:26 +0000 (12:29 -0700)]
am
14bd2e94: Merge "Revert "Add reprocess method, redefine gralloc ZSL usage flag"" into jb-mr1-dev
* commit '
14bd2e94e4ccf1ab7c268b6ee338d6b8c76b3baf':
Revert "Add reprocess method, redefine gralloc ZSL usage flag"
Eino-Ville Talvala [Tue, 4 Sep 2012 19:28:10 +0000 (12:28 -0700)]
Merge "Revert "Add reprocess method, redefine gralloc ZSL usage flag"" into jb-mr1-dev
Eino-Ville Talvala [Tue, 4 Sep 2012 19:27:14 +0000 (12:27 -0700)]
Revert "Add reprocess method, redefine gralloc ZSL usage flag"
More dependent projects than I realized
This reverts commit
7fa4a7e706cd8da0a4fd6722ff3b00b8088a01ae
Change-Id: I813ffde0f8d602fd6d75186bf82e93c7ffed9a9a
Eino-Ville Talvala [Tue, 4 Sep 2012 19:11:23 +0000 (12:11 -0700)]
am
7704d73e: Merge "Add reprocess method, redefine gralloc ZSL usage flag" into jb-mr1-dev
* commit '
7704d73e85650258a74bd28b8ce400eed1acfce3':
Add reprocess method, redefine gralloc ZSL usage flag
Eino-Ville Talvala [Tue, 4 Sep 2012 19:08:53 +0000 (12:08 -0700)]
Merge "Add reprocess method, redefine gralloc ZSL usage flag" into jb-mr1-dev
Jesse Hall [Tue, 4 Sep 2012 18:42:09 +0000 (11:42 -0700)]
Make HWC_MODULE_API_VERSION fit in uint16_t again
Change-Id: I4e32c3b7be9826cfac1e7226f7fd8894b6c97c1e
The Android Automerger [Mon, 3 Sep 2012 13:34:13 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Fri, 31 Aug 2012 06:55:53 +0000 (23:55 -0700)]
Add reprocess method, redefine gralloc ZSL usage flag
- Camera2: Add allocate_reprocess_stream_from_stream for ZSL usecases
- Gralloc: Make GRALLOC_USAGE_HW_CAMERA_ZSL be simply
GRALLOC_USAGE_HW_CAMERA_READ | GRALLOC_USAGE_HW_CAMERA_WRITE
- Gralloc: Add GRALLOC_USAGE_HW_CAMERA_MASK
Change-Id: Icd8ac1f786e3adb6a422f27f03a5a4cb04a815cc
Eric Laurent [Sat, 1 Sep 2012 01:42:35 +0000 (18:42 -0700)]
audio effects: add audio source indication
Added a command to audio effect API to indicate the
audio source to audio pre processings.
Change-Id: Ia9d68bc095b8bc5d3cf847a406ec0a719a1c14ac
Jesse Hall [Fri, 31 Aug 2012 19:58:55 +0000 (12:58 -0700)]
am
07f4e866: Merge "Add new HWC 1.1 queries and hotplug callback" into jb-mr1-dev
* commit '
07f4e866624841df150e1ade7a52a45ab5feb5f9':
Add new HWC 1.1 queries and hotplug callback
Jesse Hall [Fri, 31 Aug 2012 19:56:57 +0000 (12:56 -0700)]
Merge "Add new HWC 1.1 queries and hotplug callback" into jb-mr1-dev
Jesse Hall [Wed, 29 Aug 2012 17:37:37 +0000 (10:37 -0700)]
Add new HWC 1.1 queries and hotplug callback
Change-Id: I40164e60b33174e98a3843ec99f1680b1bb1c675
Jesse Hall [Thu, 30 Aug 2012 20:55:46 +0000 (13:55 -0700)]
am
0cb93e60: Merge "Encode header version in api versions" into jb-mr1-dev
* commit '
0cb93e60ec97965faec03ed33c1aadbc6d58191b':
Encode header version in api versions
Jesse Hall [Thu, 30 Aug 2012 20:53:13 +0000 (13:53 -0700)]
Merge "Encode header version in api versions" into jb-mr1-dev
Eino-Ville Talvala [Thu, 30 Aug 2012 16:40:19 +0000 (09:40 -0700)]
am
68b7eeb7: Camera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
* commit '
68b7eeb7eb65c0c742e451f4a9e77e81ad6006fd':
Camera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
Jesse Hall [Tue, 28 Aug 2012 22:23:58 +0000 (15:23 -0700)]
Encode header version in api versions
Change-Id: I0216bef3ba0cfaed2fe908f735e546d0734c0b13
Eino-Ville Talvala [Tue, 28 Aug 2012 21:01:26 +0000 (14:01 -0700)]
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
The Android Automerger [Tue, 28 Aug 2012 13:33:55 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Mon, 27 Aug 2012 17:35:59 +0000 (10:35 -0700)]
am
27274aed: Camera2: Make static_camera_characteristics const.
* commit '
27274aed3911faf08e9ccbb5afc04f2865d48647':
Camera2: Make static_camera_characteristics const.
Eino-Ville Talvala [Fri, 24 Aug 2012 19:32:17 +0000 (12:32 -0700)]
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
The Android Automerger [Mon, 27 Aug 2012 13:34:14 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Sun, 26 Aug 2012 21:46:34 +0000 (14:46 -0700)]
am
50e5302b: Merge "Revert "Camera2: Make static_camera_characteristics const."" into jb-mr1-dev
* commit '
50e5302bcafd8a7afd81833f75de15286cc31bed':
Revert "Camera2: Make static_camera_characteristics const."
Eino-Ville Talvala [Sun, 26 Aug 2012 21:44:45 +0000 (14:44 -0700)]
Merge "Revert "Camera2: Make static_camera_characteristics const."" into jb-mr1-dev
Eino-Ville Talvala [Sun, 26 Aug 2012 21:44:38 +0000 (14:44 -0700)]
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
Eino-Ville Talvala [Sun, 26 Aug 2012 21:18:22 +0000 (14:18 -0700)]
am
833cafc1: Merge "Camera2: Make static_camera_characteristics const." into jb-mr1-dev
* commit '
833cafc1abd5a2a5c18338b242595b48f403d266':
Camera2: Make static_camera_characteristics const.
Eino-Ville Talvala [Sun, 26 Aug 2012 21:15:54 +0000 (14:15 -0700)]
Merge "Camera2: Make static_camera_characteristics const." into jb-mr1-dev
The Android Open Source Project [Sat, 25 Aug 2012 14:16:30 +0000 (07:16 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I9439837df0d836e5efbe11b88f3efada5c2faba4
Eino-Ville Talvala [Fri, 24 Aug 2012 19:32:17 +0000 (12:32 -0700)]
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
Jesse Hall [Thu, 23 Aug 2012 16:16:48 +0000 (09:16 -0700)]
am
ed5c2c33: Simplify and clean up legacy decisions
* commit '
ed5c2c33cf3f1a854de54a4e8a8003ffaafc2ffc':
Simplify and clean up legacy decisions
The Android Automerger [Thu, 23 Aug 2012 13:33:52 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Wed, 22 Aug 2012 22:35:40 +0000 (15:35 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I4d7f5e333a41b90f6e25ecf90157909830b1c27d
Jesse Hall [Wed, 22 Aug 2012 21:19:11 +0000 (14:19 -0700)]
am
aeba17d2: Add NUM_DISPLAY_TYPES query and refine display list semantics
* commit '
aeba17d23a88be34abfecd9550e4f4269f0bbf00':
Add NUM_DISPLAY_TYPES query and refine display list semantics
Jesse Hall [Tue, 21 Aug 2012 19:06:28 +0000 (12:06 -0700)]
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
Jesse Hall [Wed, 22 Aug 2012 18:42:57 +0000 (11:42 -0700)]
Add NUM_DISPLAY_TYPES query and refine display list semantics
Change-Id: I740859bfa2b126edcdf06f7b2c8208770bc864f9
The Android Automerger [Wed, 22 Aug 2012 13:33:52 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Tue, 21 Aug 2012 23:06:14 +0000 (16:06 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: If63c17a08e92cffdb9fdab5e62b1bcaff4673232
Jesse Hall [Tue, 21 Aug 2012 22:30:41 +0000 (15:30 -0700)]
am
f82c6417: Define HWC_DEVICE_API_VERSION_1_1
* commit '
f82c6417f5bd728105b0ceac6dcba28072ef79a4':
Define HWC_DEVICE_API_VERSION_1_1
Jesse Hall [Tue, 21 Aug 2012 22:24:55 +0000 (15:24 -0700)]
Define HWC_DEVICE_API_VERSION_1_1
Change-Id: I925e010fb6367979de9b7657607ea5b444820a7e
The Android Automerger [Tue, 21 Aug 2012 13:34:31 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jesse Hall [Mon, 20 Aug 2012 23:35:54 +0000 (16:35 -0700)]
am
ab128b9f: Merge "HWC 1.1: add FRAMEBUFFER_TARGET layer type" into jb-mr1-dev
* commit '
ab128b9ff63602f4cd9c67a22edfa39ddfb5a3e9':
HWC 1.1: add FRAMEBUFFER_TARGET layer type
Jesse Hall [Mon, 20 Aug 2012 23:34:02 +0000 (16:34 -0700)]
Merge "HWC 1.1: add FRAMEBUFFER_TARGET layer type" into jb-mr1-dev
The Android Automerger [Mon, 20 Aug 2012 13:34:58 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Colin Cross [Fri, 17 Aug 2012 00:03:29 +0000 (17:03 -0700)]
am
9affae6f: hwc: update blank documentation to specify that blank is synchronous
* commit '
9affae6fd10d27850b39f3452ce8b370076a78d2':
hwc: update blank documentation to specify that blank is synchronous
Jesse Hall [Thu, 16 Aug 2012 23:21:13 +0000 (16:21 -0700)]
HWC 1.1: add FRAMEBUFFER_TARGET layer type
Change-Id: I61965c343dceb4137bc439b49ea90ec13183b719
Colin Cross [Thu, 16 Aug 2012 21:45:06 +0000 (14:45 -0700)]
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
The Android Open Source Project [Wed, 15 Aug 2012 15:27:45 +0000 (08:27 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I5aeced4f5a3183ec2acf09356d43087857da634b
The Android Automerger [Tue, 14 Aug 2012 14:07:26 +0000 (07:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Matthew Xie [Tue, 14 Aug 2012 06:56:29 +0000 (23:56 -0700)]
am
df26a1dd: Merge "Enhanced bluetooth HAL with DUT mode APIs" into jb-mr1-dev
* commit '
df26a1dd79af85c41ae7edb37506ccffcb3e9bb5':
Enhanced bluetooth HAL with DUT mode APIs
Matthew Xie [Tue, 14 Aug 2012 06:55:26 +0000 (23:55 -0700)]
Merge "Enhanced bluetooth HAL with DUT mode APIs" into jb-mr1-dev
Kenny Root [Tue, 14 Aug 2012 00:32:40 +0000 (17:32 -0700)]
am
a7571d29: am
42a70b67: Merge "Enhance keymaster tests"
* commit '
a7571d29464f4908fc59c92f542ae7d770c319a8':
Enhance keymaster tests
Kenny Root [Tue, 14 Aug 2012 00:31:00 +0000 (17:31 -0700)]
am
42a70b67: Merge "Enhance keymaster tests"
* commit '
42a70b67abf0fce9c0f898c92a6e3c36e92773e9':
Enhance keymaster tests
Kenny Root [Mon, 13 Aug 2012 23:33:05 +0000 (16:33 -0700)]
Merge "Enhance keymaster tests"
Kenny Root [Thu, 9 Aug 2012 00:04:40 +0000 (17:04 -0700)]
Enhance keymaster tests
Check the key values of successful attempts.
For imported keys, the key values should match the
input values when they're returned.
For generated keys, the modulus size should be correct and the public
exponent should be correct.
(cherry-pick of
280dbc7e691304cccb2a32683d1a5a13cc188e41)
Bug:
6736252
Bug: http://code.google.com/p/android/issues/detail?id=34212
Change-Id: Ieaf922ec83e0b81feb08f6ac3977e4aabd09ce14
Kenny Root [Mon, 13 Aug 2012 22:10:57 +0000 (15:10 -0700)]
am
40478c72: Merge "Enhance keymaster tests" into jb-mr1-dev
* commit '
40478c722cc63eb96f04945646608c867d842111':
Enhance keymaster tests
Kenny Root [Mon, 13 Aug 2012 22:09:08 +0000 (15:09 -0700)]
Merge "Enhance keymaster tests" into jb-mr1-dev
Kausik Sinnaswamy [Thu, 9 Aug 2012 06:53:20 +0000 (12:23 +0530)]
Enhanced bluetooth HAL with DUT mode APIs
These APIs are needed to allow the bluetooth chip to be put into DUT
mode so that RF/BB BQB tests can be run
Change-Id: I0b01943256bb77ad7924bf67cabfc468662a2299
The Android Automerger [Mon, 13 Aug 2012 15:09:27 +0000 (08:09 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Fri, 10 Aug 2012 17:08:44 +0000 (10:08 -0700)]
am
c6e29402: Camera2: Add ZSL pixel format, AF CANCEL trigger, lots of docs
* commit '
c6e29402f293edad30d225030dbf269e74290648':
Camera2: Add ZSL pixel format, AF CANCEL trigger, lots of docs
Eino-Ville Talvala [Fri, 3 Aug 2012 17:56:57 +0000 (10:56 -0700)]
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
Kenny Root [Thu, 9 Aug 2012 00:04:40 +0000 (17:04 -0700)]
Enhance keymaster tests
Check the key values of successful attempts.
For imported keys, the key values should match the
input values when they're returned.
For generated keys, the modulus size should be correct and the public
exponent should be correct.
Bug:
6736252
Bug: http://code.google.com/p/android/issues/detail?id=34212
Change-Id: I37ed97d36ebfbe4301b43426129928bcb53c39f8
The Android Open Source Project [Wed, 8 Aug 2012 15:17:15 +0000 (08:17 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I7c0399122deae2e64d6ea795f3e1722ec6e557d6
The Android Automerger [Wed, 8 Aug 2012 13:47:28 +0000 (06:47 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Tue, 7 Aug 2012 23:21:39 +0000 (16:21 -0700)]
am
992006f1: Merge "Simplify prepare and set semantics (comments only)" into jb-mr1-dev
* commit '
992006f19a5cd2e6bade28c20667b34d4d3b12c8':
Simplify prepare and set semantics (comments only)
Jamie Gennis [Tue, 7 Aug 2012 23:20:07 +0000 (16:20 -0700)]
Merge "Simplify prepare and set semantics (comments only)" into jb-mr1-dev
John Grossman [Tue, 7 Aug 2012 23:18:03 +0000 (16:18 -0700)]
am
788faa7f: Extend the audio HAL interface to support get/set master mute
* commit '
788faa7f28add4e2c619776d26536892ecf0d4f4':
Extend the audio HAL interface to support get/set master mute
Jesse Hall [Tue, 31 Jul 2012 22:18:32 +0000 (15:18 -0700)]
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
John Grossman [Tue, 17 Jul 2012 18:54:04 +0000 (11:54 -0700)]
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>
Jesse Hall [Tue, 7 Aug 2012 20:50:42 +0000 (13:50 -0700)]
am
18d30d64: Add multi-display and flip fence to HWC
* commit '
18d30d64a6efaaf0871c28e772e4c440ae531d6d':
Add multi-display and flip fence to HWC
Jesse Hall [Tue, 31 Jul 2012 21:29:00 +0000 (14:29 -0700)]
Add multi-display and flip fence to HWC
Change-Id: I3b0446050648e2b386ffb32976c9943b6fd9793d
The Android Open Source Project [Mon, 6 Aug 2012 20:23:59 +0000 (13:23 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I6b06bd8fda70c906308525bd106c47da553e4e9b
The Android Automerger [Mon, 6 Aug 2012 13:28:37 +0000 (06:28 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Fri, 3 Aug 2012 20:59:46 +0000 (13:59 -0700)]
am
ca383297: Camera2: Test logging changes
* commit '
ca383297ff9581c50ded2b7bb2a7c36f7c659716':
Camera2: Test logging changes
The Android Open Source Project [Tue, 31 Jul 2012 22:03:26 +0000 (15:03 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie13896fc0b2ee88acfea873eabe0baa520d88225
Eino-Ville Talvala [Mon, 30 Jul 2012 17:12:40 +0000 (10:12 -0700)]
Camera2: Test logging changes
Change-Id: Idcde83d46da438726c5186cbcf8109a22aef997f
Jesse Hall [Tue, 31 Jul 2012 19:16:24 +0000 (12:16 -0700)]
Revert "Add multi-display and flip fence to HWC"
This reverts commit
1d51b2b9fc713da6de18117bc19508ecdfde4f23
Change-Id: I1ae46d8cae1cb3064800cd24df56347b05eb6059
Jesse Hall [Tue, 31 Jul 2012 19:25:35 +0000 (12:25 -0700)]
am
fefff86b: Revert "Add multi-display and flip fence to HWC"
* commit '
fefff86b905de3a3d898b38c4d478ccabe9761d9':
Revert "Add multi-display and flip fence to HWC"
Jesse Hall [Tue, 31 Jul 2012 19:16:24 +0000 (12:16 -0700)]
Revert "Add multi-display and flip fence to HWC"
This reverts commit
1d51b2b9fc713da6de18117bc19508ecdfde4f23
Change-Id: I1ae46d8cae1cb3064800cd24df56347b05eb6059
The Android Open Source Project [Tue, 31 Jul 2012 14:52:04 +0000 (07:52 -0700)]
Sync with jb-mr1-dev
Change-Id: Ib27348c1d11365771806a140e5fba06e2dd32cde
Jesse Hall [Wed, 25 Jul 2012 22:11:41 +0000 (15:11 -0700)]
Add multi-display and flip fence to HWC
Change-Id: I31b4fc293220bc51169971df93347dd35fdc30ef
Ed Heyl [Thu, 26 Jul 2012 20:47:35 +0000 (13:47 -0700)]
Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev
Glenn Kasten [Wed, 25 Jul 2012 22:46:13 +0000 (15:46 -0700)]
Merge "Add comment"
Glenn Kasten [Fri, 22 Jun 2012 20:35:54 +0000 (13:35 -0700)]
Add comment
Change-Id: Idc2890ebc10c0e6a116bc7c8872cd379e1cf3e25
Glenn Kasten [Mon, 20 Feb 2012 20:08:57 +0000 (12:08 -0800)]
struct effect_descriptor_s const correctness
Also struct audio_stream in audio_stream_frame_size
Change-Id: Ie0de708e38a1850c186a8b4eb5f491adc44b3275
John Grossman [Thu, 19 Jul 2012 07:39:16 +0000 (00:39 -0700)]
am
afc55fd4: (-s ours) Extend the audio HAL interface to support get/set master mute: DO NOT MERGE
* commit '
afc55fd404d7d86f0affc9080ccb42aad8745d3a':
Extend the audio HAL interface to support get/set master mute: DO NOT MERGE
John Grossman [Tue, 17 Jul 2012 18:54:04 +0000 (11:54 -0700)]
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
Eino-Ville Talvala [Tue, 17 Jul 2012 21:11:14 +0000 (14:11 -0700)]
Merge "Add camera gralloc usage flags."
Matthew Xie [Tue, 17 Jul 2012 04:33:30 +0000 (21:33 -0700)]
Merge changes I9622e8a0,I7b942e10,I3abd86e9,I27656f52,I662c7595,Ida4ef37e,Ic501281b,Ic2b1c5c1,I2caace57,Id6fc8f89,Id067423b,Iddd90ccc,I7fe01250,Iad7bf631,Ieaa5b37b,I68ef3117,I017ec2b0
* changes:
add 0xff to the end of an enum
Adding authentication failure reason specific status codes to bt_status_t structure
Add support for CMEE
Added ACL connected/disconnected events/callbacks to the Bluetooth HAL
Enabled audio state changed JNI callback in A2DP HAL
added pan profile
Added API to get remote services of device
Added comment for mutli accept listen
added new btif_hl (HDP profile) module
Changed the arguements for set report and send data api Signed-off-by: Priti Aghera <paghera@broadcom.com>
new bt socket interface
Added dedicated HAL callback notifying framework on audio datapath events
Added new state BT_BOND_STATE_BONDING.
Align the service status codes with spec. Add a new state for slc connection notification
PTS fixes: Re-define the call state values to match CLCC
Merged the Passkey request callback and the passkey reply APIs into the SSP API and callback respectively
1.) Dynamic enable/disable of profiles using the respective profile init/cleanup APIs
Matthew Xie [Tue, 17 Jul 2012 04:33:29 +0000 (21:33 -0700)]
Merge changes Ia96504db,I4c456390,Id04160d4
* changes:
Initial Bluedroid stack commit
Add typedefs and defines to obfuscate the word hardware.
Initial commit of Bluetooth Abstraction Layer Hdr.
Eino-Ville Talvala [Mon, 16 Jul 2012 21:50:50 +0000 (14:50 -0700)]
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
Matthew Xie [Fri, 22 Jun 2012 00:35:06 +0000 (17:35 -0700)]
add 0xff to the end of an enum
Change-Id: I9622e8a06ae075b67c4091874986625d52115261
Ganesh Ganapathi Batta [Fri, 27 Apr 2012 21:04:28 +0000 (14:04 -0700)]
Adding authentication failure reason specific status codes to bt_status_t structure
Change-Id: I7b942e101201ea54e623e91e1e19433b2d7fe1ba