OSDN Git Service
Martijn Coenen [Mon, 1 Oct 2012 21:04:35 +0000 (14:04 -0700)]
am
3fb2be64: Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev
* commit '
3fb2be64fffda871ab2d7a2bf8fb98a3cc8835a5':
NFC HAL: Use a separate callback for data.
Martijn Coenen [Mon, 1 Oct 2012 21:02:06 +0000 (14:02 -0700)]
Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev
Jean-Michel Trivi [Mon, 1 Oct 2012 17:15:09 +0000 (10:15 -0700)]
am
4d7640ae: Merge "bug
7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev
* commit '
4d7640ae5143ce991ee76abe0622eaf272a149de':
bug
7253033 Add "exiting" state to remote audio submix module
Jean-Michel Trivi [Sun, 30 Sep 2012 18:56:23 +0000 (11:56 -0700)]
Merge "bug
7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev
Jean-Michel Trivi [Sun, 30 Sep 2012 18:08:06 +0000 (11:08 -0700)]
bug
7253033 Add "exiting" state to remote audio submix module
Support receiving a parameter that sets the remote audio submix
module in a state where the audio pipe will unblock any current
write operation and not block anymore.
Change-Id: Ia3119cd79972afff0de24187dae627855a468ebf
Martijn Coenen [Sun, 30 Sep 2012 18:06:22 +0000 (11:06 -0700)]
NFC HAL: Use a separate callback for data.
Bug:
7258325
Change-Id: I02d8ea1bdcb8ea6a9430e3dc286f5c2647277f72
Alex Ray [Fri, 28 Sep 2012 19:49:25 +0000 (12:49 -0700)]
am
cecacd4e: Camera2: Change JPEG transport header
* commit '
cecacd4e71c35fd50dbe1e9855cbab0faa17b550':
Camera2: Change JPEG transport header
Alex Ray [Thu, 27 Sep 2012 22:48:23 +0000 (15:48 -0700)]
Camera2: Change JPEG transport header
The way buffers are passed to JPEG encoders makes it difficult to
account for a header offset. This explains moving the header to
the end, and clarifies the required header packing.
Bug:
7108816
Change-Id: I569cd0cde37bd6fd7110fbc95d7fced9a55cff9c
The Android Open Source Project [Mon, 24 Sep 2012 17:12:37 +0000 (10:12 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie1ba92a7c1b156a8a32deca7e2f55181f1c626eb
Eino-Ville Talvala [Mon, 24 Sep 2012 15:25:53 +0000 (08:25 -0700)]
am
3a90d596: Merge "Camera2: Add JPEG transport header" into jb-mr1-dev
* commit '
3a90d5964bc17ace1097e06a62d0410241c6c99c':
Camera2: Add JPEG transport header
The Android Automerger [Sat, 22 Sep 2012 16:42:02 +0000 (09:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Sat, 22 Sep 2012 01:33:50 +0000 (18:33 -0700)]
Merge "Camera2: Add JPEG transport header" into jb-mr1-dev
The Android Automerger [Fri, 21 Sep 2012 13:59:54 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jesse Hall [Thu, 20 Sep 2012 21:13:53 +0000 (14:13 -0700)]
am
919e1c45: Merge "Document reentrancy and error conditions" into jb-mr1-dev
* commit '
919e1c45b77b99c0215a53ab93d8032abb6d8c26':
Document reentrancy and error conditions
Jesse Hall [Thu, 20 Sep 2012 21:13:07 +0000 (14:13 -0700)]
Merge "Document reentrancy and error conditions" into jb-mr1-dev
The Android Open Source Project [Thu, 20 Sep 2012 17:36:07 +0000 (10:36 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: If425346af9f905a95bbcdcc41035ce937280528c
Jesse Hall [Thu, 20 Sep 2012 05:53:30 +0000 (22:53 -0700)]
Document reentrancy and error conditions
The hotplug callback is non-reentrant. The display config functions
return an error if called for a disconnected display type.
Change-Id: I52d11a53f9b30a7c39e98b0a9b07eb97a3d2becd
Eino-Ville Talvala [Wed, 19 Sep 2012 18:42:40 +0000 (11:42 -0700)]
Camera2: Add JPEG transport header
To simplify passing compressed JPEG data between the HAL and the
camera service, add a transport header for use with JPEG streams.
Bug:
7108816
Change-Id: I91060051f59032e66eaaab3ee9f651badd1f2ac0
The Android Automerger [Wed, 19 Sep 2012 14:01:39 +0000 (07:01 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andre Eisenbach [Tue, 18 Sep 2012 22:14:35 +0000 (15:14 -0700)]
am
05f49546: Initial Bluetooth open source release
* commit '
05f49546a9c70805cbd77e71c7998652f91ec535':
Initial Bluetooth open source release
Andre Eisenbach [Tue, 18 Sep 2012 19:15:26 +0000 (12:15 -0700)]
Initial Bluetooth open source release
Change-Id: I27bb95db854806d7deedaf6c622b17cb09f62f16
Jean-Michel Trivi [Tue, 18 Sep 2012 17:33:21 +0000 (10:33 -0700)]
am
97c262fc: Remote submix: fix sink/source reference count handling
* commit '
97c262fc848c407f316fd7fe2b468a540f3bc38f':
Remote submix: fix sink/source reference count handling
The Android Automerger [Tue, 18 Sep 2012 13:59:53 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Tue, 18 Sep 2012 01:27:56 +0000 (18:27 -0700)]
Remote submix: fix sink/source reference count handling
The reference count on the strong pointers to the audio sink and
source should be done on the object retrieved from the device
structure, not by accessing the corresponding fields, as they
can be cleared while reading or writing audio data.
Change-Id: I446a2c7bdcb0758b4013b0ad75450a15203fb9da
Jean-Michel Trivi [Mon, 17 Sep 2012 17:20:07 +0000 (10:20 -0700)]
am
35a2c167: Turn off logs in remote submix audio module
* commit '
35a2c167b4ee090b5dd9779ecb40f82cdaf1c74d':
Turn off logs in remote submix audio module
Jean-Michel Trivi [Mon, 17 Sep 2012 17:13:26 +0000 (10:13 -0700)]
Turn off logs in remote submix audio module
Change-Id: I61cd15534b1cd764b06f615569cdf02edbba909c
Jean-Michel Trivi [Mon, 17 Sep 2012 17:03:01 +0000 (10:03 -0700)]
am
eec87706: Remote audio submix: blocking writes and sleeping reads.
* commit '
eec87706d21fc0ac4ad10ede86943770b2533564':
Remote audio submix: blocking writes and sleeping reads.
Jean-Michel Trivi [Mon, 17 Sep 2012 16:59:42 +0000 (09:59 -0700)]
Remote audio submix: blocking writes and sleeping reads.
Change how the remote audio submix is handling piping audio
through the pipe:
- use a MonoPipe as audio sink for blocking writes,
- use a MonoPipeReader as audio source for non blocking reads,
and keep track of when recording started to align the
time at which the in_read() call should return with the
projected time of the recording duration.
Change-Id: I8b0f8c56a0486806101e272dfbf9c6d2d1c11112
The Android Automerger [Sun, 16 Sep 2012 13:59:50 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Baptiste Queru [Sat, 15 Sep 2012 17:00:06 +0000 (10:00 -0700)]
Merge
Change-Id: I627bfcffe33110e091c6fa8d23d195c67d92156f
Jean-Baptiste Queru [Sat, 15 Sep 2012 16:24:58 +0000 (09:24 -0700)]
Delete headers that have been moved
Change-Id: I72e81a3ea789fe15d5a6cea281ebe43f82220669
Mathias Agopian [Sat, 15 Sep 2012 00:41:13 +0000 (17:41 -0700)]
Merge "Layer flags won't change between prepare and set" into jb-mr1-dev
Jesse Hall [Sat, 15 Sep 2012 00:21:22 +0000 (17:21 -0700)]
Layer flags won't change between prepare and set
Change-Id: I0f25766976e4f783066e5b6fd917d1769906e43e
The Android Automerger [Fri, 14 Sep 2012 21:10:33 +0000 (14:10 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Martijn Coenen [Fri, 14 Sep 2012 20:59:33 +0000 (13:59 -0700)]
am
5404f9da: Initial NFC HAL for NCI controllers.
* commit '
5404f9daaf2dabef5a650dd9947ad6991ab316cd':
Initial NFC HAL for NCI controllers.
Martijn Coenen [Wed, 12 Sep 2012 21:59:39 +0000 (17:59 -0400)]
Initial NFC HAL for NCI controllers.
Bug:
7123942
Change-Id: Ic64aa6477f2eb65b489b3be5d49ad21ccce63e2d
Eino-Ville Talvala [Fri, 14 Sep 2012 18:33:33 +0000 (11:33 -0700)]
am
f3b13810: Camera2: Add CAMERA2_HAL_PIXEL_FORMAT_ZSL temporarily.
* commit '
f3b13810776cf5ecf070cf386977d1baab99b810':
Camera2: Add CAMERA2_HAL_PIXEL_FORMAT_ZSL temporarily.
The Android Automerger [Fri, 14 Sep 2012 14:11:57 +0000 (07:11 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Thu, 13 Sep 2012 23:32:14 +0000 (16:32 -0700)]
Camera2: Add CAMERA2_HAL_PIXEL_FORMAT_ZSL temporarily.
Until all HAL implementations move to the new gralloc format selection
scheme, define FORMAT_ZSL for indicating ZSL streams.
Bug:
6243944
Change-Id: I90249beaaca5da80c9464eedd6aa9d3648bb56cc
Jean-Michel Trivi [Thu, 13 Sep 2012 20:38:03 +0000 (13:38 -0700)]
am
41dd7314: Merge "Remote submix audio module: sleep less, log errors" into jb-mr1-dev
* commit '
41dd73140ef8e6a2408a1d45190cbb82f380d720':
Remote submix audio module: sleep less, log errors
Jean-Michel Trivi [Thu, 13 Sep 2012 20:36:13 +0000 (13:36 -0700)]
Merge "Remote submix audio module: sleep less, log errors" into jb-mr1-dev
Jean-Michel Trivi [Wed, 12 Sep 2012 02:19:08 +0000 (19:19 -0700)]
Remote submix audio module: sleep less, log errors
Neither write nor read are blocking, but write simulates
timing by checking the clock between two writes and
computing how long the next sleep should last.
Change-Id: I495ae6d44b0cf75a24fe4b70662cfac679049c67
The Android Automerger [Thu, 13 Sep 2012 13:59:54 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jesse Hall [Thu, 13 Sep 2012 03:20:01 +0000 (20:20 -0700)]
am
ea569c6f: Add outbuf fields for HWC 1.2 virtual displays
* commit '
ea569c6f94c83dcbd08f6ebd8ac7603b3f6a2048':
Add outbuf fields for HWC 1.2 virtual displays
Jesse Hall [Thu, 6 Sep 2012 23:57:12 +0000 (16:57 -0700)]
Add outbuf fields for HWC 1.2 virtual displays
Also rename HWC_DISPLAY_RESOLUTION_* to HWC_DISPLAY_WIDTH and
HWC_DISPLAY_HEIGHT for consistency.
Change-Id: Iabe6db0816f6f6eaaac24c3c9ae554177bcabf1d
The Android Open Source Project [Wed, 12 Sep 2012 14:41:05 +0000 (07:41 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I190165deaba5ac670791cca5ab2da7d4aefd1d5f
The Android Automerger [Tue, 11 Sep 2012 13:59:42 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eric Laurent [Mon, 10 Sep 2012 19:18:52 +0000 (12:18 -0700)]
am
9b1abaab: update audio remote submix API revision
* commit '
9b1abaab145b7b631ac890f48c5440d6da8efdc7':
update audio remote submix API revision
Eric Laurent [Mon, 10 Sep 2012 17:36:09 +0000 (10:36 -0700)]
update audio remote submix API revision
Update remote submix audio HAL API revision to 2.0
(new audio device enums).
Change-Id: I61d5faf498144002929e570ee50375b059fb17c5
The Android Automerger [Sun, 9 Sep 2012 14:00:36 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eric Laurent [Fri, 7 Sep 2012 21:53:46 +0000 (14:53 -0700)]
am
8f59ea8d: Merge "audio: new audio devices enums" into jb-mr1-dev
* commit '
8f59ea8d1981026130b1b7e78029ce512a48b039':
audio: new audio devices enums
Eric Laurent [Fri, 7 Sep 2012 21:52:27 +0000 (14:52 -0700)]
Merge "audio: new audio devices enums" into jb-mr1-dev
Jean-Michel Trivi [Fri, 7 Sep 2012 18:50:18 +0000 (11:50 -0700)]
am
0e94a68b: Audio remote submix in hardware modules
* commit '
0e94a68b1b7013c8a119411d8936373dce4167a9':
Audio remote submix in hardware modules
Jean-Michel Trivi [Fri, 7 Sep 2012 18:25:59 +0000 (11:25 -0700)]
Audio remote submix in hardware modules
Change-Id: I878c6f36685eff48a3cd51acceec812b61994945
Eric Laurent [Tue, 28 Aug 2012 21:30:35 +0000 (14:30 -0700)]
audio: new audio devices enums
Changed audio device API version to 2.0 because of
new enums for audio input and output devices.
Removed implementations of get_supported_devices() in
stub and usb audio modules.
Change-Id: I09345d38929d931e5015e36d18259f5a5f950298
Jean-Michel Trivi [Fri, 7 Sep 2012 17:04:36 +0000 (10:04 -0700)]
am
67f41fbd: Add audio module for remote submix
* commit '
67f41fbd030c8eee16bd83a29ed4f62fbbca6f3d':
Add audio module for remote submix
Jean-Michel Trivi [Thu, 16 Aug 2012 20:56:03 +0000 (13:56 -0700)]
Add audio module for remote submix
New definitions of audio devices for remote submix: one representing
a sink for writing the audio buffers that won't be played directly
locally, another representing the audio source that can be read from
to obtain the audio mix.
New audio hardware module encapsulating the submix loop functionality.
Create a Pipe to serve as non-blocking audio ring buffer between
the output device (the sink) and the input device (the source).
Change-Id: I527f4721a69ced0430a99ebba3b4db7d419f2bb2
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
OSDN Git Service
