OSDN Git Service
Jesse Hall [Sun, 18 May 2014 05:46:13 +0000 (22:46 -0700)]
opengl: Regenerate code with ES 3.1 and new extensions
Enable ES 3.1 generation in glgen.py, and regenerate everything to add
support for that as well as these new extensions in the registry:
- EXT_copy_image
- EXT_draw_buffers_indexed
- EXT_geometry_shader
- EXT_gpu_shader5
- EXT_primitive_bounding_box
- EXT_shader_implicit_conversions
- EXT_shader_io_blocks
- EXT_tessellation_shader
- EXT_texture_border_clamp
- EXT_texture_buffer
- EXT_texture_cube_map_array
- EXT_texture_view
Bug:
15028495
Change-Id: I3f45a7ef5367c70e54ce6b36a8c030ae11033434
Jesse Hall [Sun, 18 May 2014 05:46:36 +0000 (22:46 -0700)]
opengl: Add EXT_primitive_bounding_box to registry
This extension hasn't been published yet, so it isn't in the public
registry. That will change before the next platform release to AOSP.
Bug:
15028495
Change-Id: I3f8ac50e6a7f782738518cfd4571b07f94f83c49
Jesse Hall [Sun, 18 May 2014 05:25:45 +0000 (22:25 -0700)]
opengl: Update registry and headers from Khronos
gl.xml @ r26697:
https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api
GLES headers @ r26698:
https://cvs.khronos.org/svn/repos/registry/trunk/public/gles/api
Bug:
15028495
Change-Id: I57e0d8caac2bc2edb10c8252e06ffdb9a5ccf48b
Jesse Hall [Wed, 21 May 2014 22:03:44 +0000 (22:03 +0000)]
Merge "opengl: Update GLES headers and generate *.in from registry XML"
Jesse Hall [Wed, 14 May 2014 04:52:56 +0000 (21:52 -0700)]
opengl: Update GLES headers and generate *.in from registry XML
Import GLES headers from Khronos SVN r26322:
https://cvs.khronos.org/svn/repos/registry/trunk/public/gles/api
There are many non-functional whitespace and parameter name changes
included here. These were introduced upstream when converting from the
old .spec registry to the new XML registry.
There are also some new extensions added. Unfortunately there isn't a
version of the XML that matches the headers the previous versions of
the *.in files were generated from, so I can't separate out the
non-functional changes from the new extensions (other than temporarily
hacking them out of the XML). See below for a list.
Finally, I had to hack the official glext.h. Khronos hasn't updated
the official GLES1 headers since switching to the XML registry, and
there is one critical difference: a "const void**" parameter in the
official header is "const void* const*" in the registry. I changed the
header to avoid build errors with code generated from the registry.
Dependencies on the *.in files required manually updating some
GLES_trace/ files as well:
- gltrace_api.{h,cpp} must be manually re-generated using
tools/genapi.py.
- New GL prototypes must be manually added to gltrace.proto.
- gltrace.pb.{h,cpp} must be regenerated using aprotoc (see dev.make)
New GLES extensions in libs/GLES_CM/glext_api.in:
- GL_OES_byte_coordinates
- GL_EXT_map_buffer_range
- GL_APPLE_copy_texture_levels
- GL_APPLE_sync
New GLES2 extensions in libs/GLES2/gl2ext_api.in:
- GL_KHR_blend_equation_advanced
- GL_KHR_debug
- GL_OES_sample_shading
- GL_OES_texture_storage_multisample_2d_array
- GL_EXT_disjoint_timer_query
- GL_EXT_draw_buffers
- GL_EXT_draw_instanced
- GL_EXT_instanced_arrays
- GL_EXT_map_buffer_range
- GL_EXT_map_buffer_range
- GL_EXT_multiview_draw_buffers
- GL_EXT_separate_shader_objects
- GL_ANGLE_instanced_arrays
- GL_ANGLE_translated_shader_source
- GL_APPLE_copy_texture_levels
- GL_APPLE_sync
- GL_INTEL_performance_query
- GL_NV_blend_equation_advanced
- GL_NV_copy_buffer
- GL_NV_draw_instanced
- GL_NV_framebuffer_blit
- GL_NV_framebuffer_multisample
- GL_NV_instanced_arrays
- GL_NV_non_square_matrices
Bug:
15028495
Change-Id: I902517c23354e14f9c63b1584db286d682315bb5
Jeff Brown [Wed, 21 May 2014 02:34:36 +0000 (02:34 +0000)]
Merge "Support VIRTUAL flag in keyboard layouts."
Jeff Brown [Wed, 21 May 2014 00:27:38 +0000 (17:27 -0700)]
Support VIRTUAL flag in keyboard layouts.
This flag is used to provide haptic feedback for virtual hard keys.
Bug:
14319563
Change-Id: Ia0ca1acc8cfa00a42d1c04d279dfa59c6cc00f4d
Andy McFadden [Tue, 20 May 2014 22:29:48 +0000 (22:29 +0000)]
Merge "Add IMPLEMENTATION_DEFINED to dump"
Jesse Hall [Tue, 20 May 2014 21:59:36 +0000 (21:59 +0000)]
Merge "Revert "Update GLES headers from Khronos SVN r26322""
Jesse Hall [Tue, 20 May 2014 21:59:29 +0000 (21:59 +0000)]
Revert "Update GLES headers from Khronos SVN r26322"
This reverts commit
20670e33c76a32370695a82a3e7f2fb30be30608.
Change-Id: Iae3dfbaf852ff1b6906af1d5508c2baf1173b481
Jesse Hall [Tue, 20 May 2014 21:38:55 +0000 (21:38 +0000)]
Merge "Revert "opengl: Generate *.in from registry XML""
Jesse Hall [Tue, 20 May 2014 21:38:44 +0000 (21:38 +0000)]
Revert "opengl: Generate *.in from registry XML"
This reverts commit
4a73962c694bfe57eb2bea40ed6fb626be7006aa.
Change-Id: I1fa5cbe4d0b86f6df69d616157b3fec68d706d7a
Jesse Hall [Tue, 20 May 2014 21:37:33 +0000 (21:37 +0000)]
Merge "Revert "opengl: Update registry and headers from Khronos""
Jesse Hall [Tue, 20 May 2014 21:29:48 +0000 (21:29 +0000)]
Merge "Revert "opengl: Add EXT_primitive_bounding_box to registry""
Jesse Hall [Tue, 20 May 2014 21:29:27 +0000 (21:29 +0000)]
Merge "Revert "opengl: Regenerate code with ES 3.1 and new extensions""
Jesse Hall [Tue, 20 May 2014 21:27:40 +0000 (21:27 +0000)]
Revert "opengl: Update registry and headers from Khronos"
This reverts commit
f466a51c1325d2034326e25dd61c359ed2c566af.
Change-Id: I2fe400e2dab8327695c36dc8eed101654368cd4b
Jesse Hall [Tue, 20 May 2014 21:27:28 +0000 (21:27 +0000)]
Revert "opengl: Add EXT_primitive_bounding_box to registry"
This reverts commit
a66730f78796664fb5232aa4c1139f4b837beaf4.
Change-Id: Idc7b589316f95ca48eced9d1c30c56acd9466410
Jesse Hall [Tue, 20 May 2014 21:27:17 +0000 (21:27 +0000)]
Revert "opengl: Regenerate code with ES 3.1 and new extensions"
This reverts commit
6cb7d3dc9f1ce37547646979e0625992264ea4d0.
Change-Id: I2eb7fd721dda9c14a0bfcef1b1c9d9843bbec94b
Andy McFadden [Tue, 20 May 2014 20:28:50 +0000 (13:28 -0700)]
Add IMPLEMENTATION_DEFINED to dump
The "dumpsys SurfaceFlinger" output shows pixel formats in
human-readable form now. Add IMPLEMENTATION_DEFINED.
Change-Id: If567e34dad4b940fbfb4d0b70c65f6ab8cd5f5e7
Jesse Hall [Tue, 20 May 2014 18:42:20 +0000 (18:42 +0000)]
Merge "opengl: Regenerate code with ES 3.1 and new extensions"
Jesse Hall [Tue, 20 May 2014 18:39:52 +0000 (18:39 +0000)]
Merge "opengl: Add EXT_primitive_bounding_box to registry"
Jesse Hall [Tue, 20 May 2014 18:39:32 +0000 (18:39 +0000)]
Merge "opengl: Update registry and headers from Khronos"
Jesse Hall [Tue, 20 May 2014 18:39:16 +0000 (18:39 +0000)]
Merge "opengl: Generate *.in from registry XML"
Jesse Hall [Tue, 20 May 2014 18:38:47 +0000 (18:38 +0000)]
Merge "Update GLES headers from Khronos SVN r26322"
Ben Murdoch [Tue, 20 May 2014 17:30:21 +0000 (17:30 +0000)]
am
2bb7438c: am
c210aec4: Merge "Add android.software.webview software feature." into klp-modular-dev
* commit '
2bb7438c8ef1b4f09063250d5efe6dc98c10bdd7':
Add android.software.webview software feature.
Ben Murdoch [Tue, 20 May 2014 09:35:34 +0000 (09:35 +0000)]
am
c210aec4: Merge "Add android.software.webview software feature." into klp-modular-dev
* commit '
c210aec479e2e3e2a5e7f355f28fe9625a23f707':
Add android.software.webview software feature.
Ben Murdoch [Tue, 20 May 2014 09:31:58 +0000 (09:31 +0000)]
Merge "Add android.software.webview software feature." into klp-modular-dev
Jinsuk Kim [Tue, 20 May 2014 00:34:06 +0000 (00:34 +0000)]
Merge "New keycode definitions for HDMI-CEC"
Jesse Hall [Mon, 19 May 2014 23:49:07 +0000 (23:49 +0000)]
Merge "Import GL registry from upstream @r26448."
Jesse Hall [Mon, 19 May 2014 23:48:54 +0000 (23:48 +0000)]
Merge "Remove vestigial remnants of GLES2_dbg"
Jesse Hall [Mon, 19 May 2014 23:48:40 +0000 (23:48 +0000)]
Merge "Disable warnings when generating GL wrappers"
Jesse Hall [Mon, 19 May 2014 23:48:33 +0000 (23:48 +0000)]
Merge "Rationalize GLES2/3 .in files."
Jinsuk Kim [Wed, 14 May 2014 06:36:48 +0000 (15:36 +0900)]
New keycode definitions for HDMI-CEC
Following keys are added to be mapped to HDMI-CEC standard keys:
KEYCODE_MEDIA_TOP_MENU
KEYCODE_11
KEYCODE_12
KEYCODE_LAST_CHANNEL
KEYCODE_TV_DATA_SERVICE
Change-Id: Ie73cf4cd8355ced4753eb5bba0ea130b087dfc36
Jesse Hall [Wed, 14 May 2014 04:21:46 +0000 (21:21 -0700)]
opengl: Generate *.in from registry XML
There are many non-functional whitespace and parameter name changes
included here. These were introduced upstream when converting from the
old .spec registry to the new XML registry.
There are also some new extensions added. Unfortunately there isn't a
version of the XML that matches the headers the previous versions of
the *.in files were generated from, so I can't separate out the
non-functional changes from the new extensions (other than temporarily
hacking them out of the XML). See below.
Finally, I had to hack the official glext.h. Khronos hasn't updated
the official GLES1 headers since switching to the XML registry, and
there is one critical difference: a "const void**" parameter in the
official header is "const void* const*" in the registry. I changed the
header to avoid build errors with code generated from the registry.
Dependencies on the *.in files required manually updating some
GLES_trace/ files as well:
- gltrace_api.{h,cpp} must be manually re-generated using
tools/genapi.py.
- New GL prototypes must be manually added to gltrace.proto.
- gltrace.pb.{h,cpp} must be regenerated using aprotoc (see dev.make)
New GLES extensions in libs/GLES_CM/glext_api.in:
- GL_OES_byte_coordinates
- GL_EXT_map_buffer_range
- GL_APPLE_copy_texture_levels
- GL_APPLE_sync
New GLES2 extensions in libs/GLES2/gl2ext_api.in:
- GL_KHR_blend_equation_advanced
- GL_KHR_debug
- GL_OES_sample_shading
- GL_OES_texture_storage_multisample_2d_array
- GL_EXT_disjoint_timer_query
- GL_EXT_draw_buffers
- GL_EXT_draw_instanced
- GL_EXT_instanced_arrays
- GL_EXT_map_buffer_range
- GL_EXT_map_buffer_range
- GL_EXT_multiview_draw_buffers
- GL_EXT_separate_shader_objects
- GL_ANGLE_instanced_arrays
- GL_ANGLE_translated_shader_source
- GL_APPLE_copy_texture_levels
- GL_APPLE_sync
- GL_INTEL_performance_query
- GL_NV_blend_equation_advanced
- GL_NV_copy_buffer
- GL_NV_draw_instanced
- GL_NV_framebuffer_blit
- GL_NV_framebuffer_multisample
- GL_NV_instanced_arrays
- GL_NV_non_square_matrices
Bug:
15028495
Change-Id: Ib3fa700a146adf7f1487a93e459b1e6df0dcdc42
Jesse Hall [Sun, 18 May 2014 05:25:45 +0000 (22:25 -0700)]
opengl: Update registry and headers from Khronos
gl.xml @ r26697:
https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api
GLES headers @ r26698:
https://cvs.khronos.org/svn/repos/registry/trunk/public/gles/api
Bug:
15028495
Change-Id: Id8e7aaf8a09ec6f47dc3a3b14b95d0ddf35d50f6
Jesse Hall [Sun, 18 May 2014 05:46:36 +0000 (22:46 -0700)]
opengl: Add EXT_primitive_bounding_box to registry
This extension hasn't been published yet, so it isn't in the public
registry. That will change before the next platform release to AOSP.
Bug:
15028495
Change-Id: Iadafe0f776b5b9be4f81c4279a89c57ae02293e4
Jesse Hall [Sun, 18 May 2014 05:46:13 +0000 (22:46 -0700)]
opengl: Regenerate code with ES 3.1 and new extensions
Enable ES 3.1 generation in glgen.py, and regenerate everything to add
support for that as well as these new extensions in the registry:
- EXT_copy_image
- EXT_draw_buffers_indexed
- EXT_geometry_shader
- EXT_gpu_shader5
- EXT_primitive_bounding_box
- EXT_shader_implicit_conversions
- EXT_shader_io_blocks
- EXT_tessellation_shader
- EXT_texture_border_clamp
- EXT_texture_buffer
- EXT_texture_cube_map_array
- EXT_texture_view
Bug:
15028495
Change-Id: I35acb473cba2433b9aeb95d1b8bfbdcfadf22532
Jesse Hall [Wed, 14 May 2014 04:52:56 +0000 (21:52 -0700)]
Update GLES headers from Khronos SVN r26322
Public registry is:
https://cvs.khronos.org/svn/repos/registry/trunk/public/gles/api
Bug:
15028495
Change-Id: I2269a6a2486c34b6a9e378d4a25a41492d531c81
Jesse Hall [Mon, 21 Apr 2014 22:47:51 +0000 (15:47 -0700)]
Import GL registry from upstream @r26448.
Public GL registry is at:
https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api
Bug:
15028495
Change-Id: I41cc865bf39e1155c4467411d0b1afced44b0874
Ben Murdoch [Fri, 4 Apr 2014 12:06:43 +0000 (13:06 +0100)]
Add android.software.webview software feature.
Some devices may ship without a working WebView implementation. This
system feature will be present on devices that support a
functional WebView.
Bug:
13438487
Change-Id: I1f72756196661dca01614e124895522b60e52493
Jesse Hall [Sun, 18 May 2014 22:31:54 +0000 (15:31 -0700)]
opengl: Fix whitespace in Java templates
Someone fixed these in the generated code, so re-generating even with
no other changes caused diffs. Better to just fix it at the source.
Bug:
15028495
Change-Id: I248f9796d4e3d904c4c0dc15be5f8de231df7285
Jesse Hall [Thu, 15 May 2014 05:13:08 +0000 (22:13 -0700)]
Remove vestigial remnants of GLES2_dbg
These are left over from an early (not finished?) GL debugging
facility that morphed into GLES_trace. Most of the rest of it has
already been removed, these few pieces were still hanging aroung.
Bug:
15028495
Change-Id: Ib7c03eb8d0db30112e1b83e5262bba03006770de
Jesse Hall [Wed, 14 May 2014 04:13:14 +0000 (21:13 -0700)]
Disable warnings when generating GL wrappers
Bug:
15028495
Change-Id: Ic0c974e868d05632a06748c90cedbdd409ce2aa8
Jesse Hall [Tue, 13 May 2014 23:48:35 +0000 (16:48 -0700)]
Rationalize GLES2/3 .in files.
We weren't using gl2_api.in, since gl3_api.in was a superset. And
gl3ext_api.in was empty, and Khronos has decided to keep it that way
(any GLES2/3/... extensions will be in gl2ext.h).
Since libGLES2.so will have all future backwards-compatible GLES APIs,
it makes sense to just use gl2_api.in and gl2ext_api.in to build its
contents. This changes renames gl3_api.in to gl2_api.in and updates
uses of it, and removes gl3ext_api.in and references.
Bug:
15028495
Change-Id: I0745eda27ec91ee625f03e957e4fdb22035dd781
Tim Kilbourn [Mon, 14 Apr 2014 22:37:20 +0000 (15:37 -0700)]
Add KEYCODE_PAIRING.
Used for initiating a peripheral pairing mode.
Change-Id: I7e8439d27491ccc72d045cabf5751a35b9113aa7
Narayan Kamath [Fri, 16 May 2014 12:13:39 +0000 (12:13 +0000)]
am
f8c66b4b: am
cfba3bf1: am
c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
f8c66b4bee9ab0203b83ea3a6df8f49fad443d88':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:10:21 +0000 (12:10 +0000)]
am
cfba3bf1: am
c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
cfba3bf1606dfdb1daf1be1c19176180660ae19d':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:08:06 +0000 (12:08 +0000)]
am
c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
c9fcaf3751af078ad730913304431197e4d1ae80':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:06:10 +0000 (12:06 +0000)]
Merge "Change InputMessage.motion.pointerSize to a uint32_t."
Narayan Kamath [Fri, 2 May 2014 16:53:33 +0000 (17:53 +0100)]
Change InputMessage.motion.pointerSize to a uint32_t.
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.
(cherry-picked from
bc6001b026069714177526eb1120b0011d6f2a51)
Change-Id: I28e87050478920a54132efbbb8138076ebad1409
Todd Poynor [Thu, 8 May 2014 23:04:22 +0000 (16:04 -0700)]
BatteryProperty: Add property ENERGY_COUNTER and 64-bit integer properties
Also fixup comments to match recent changes in BatteryManager.
Change-Id: I6f40924f9e66d564ad1175f9650e2bfd2ad39a3a
Vinod Krishnan [Fri, 16 May 2014 02:45:59 +0000 (02:45 +0000)]
am
bd0f9153: am
7e6c5336: Merge "Adding a portrait and landscape file" into klp-modular-dev
* commit '
bd0f91537be0e506a92687d6084a2659cf34399c':
Adding a portrait and landscape file
Vinod Krishnan [Fri, 16 May 2014 02:44:10 +0000 (02:44 +0000)]
am
7e6c5336: Merge "Adding a portrait and landscape file" into klp-modular-dev
* commit '
7e6c53366d916e11fd6237c9456c394ff6a1cb1f':
Adding a portrait and landscape file
Vinod Krishnan [Fri, 16 May 2014 02:41:08 +0000 (02:41 +0000)]
Merge "Adding a portrait and landscape file" into klp-modular-dev
Vinod Krishnan [Thu, 15 May 2014 22:44:16 +0000 (15:44 -0700)]
Adding a portrait and landscape file
- Some wearable devices do not support landscape
- CTS tests were expecting some behavior which would not work since
it was not able to switch from portrait to landscape.
- Creating 2 files and then each of the devices will include that
particular feature that it supports.
Change-Id: If0e3151e23264a49f4964e1c643b33a90b78c114
Vinod Krishnan [Fri, 16 May 2014 01:47:33 +0000 (01:47 +0000)]
am
b017932e: am
035839c6: Adding Feature for HRM
* commit '
b017932e4a659f637085e37e09e3aa20849d62b8':
Adding Feature for HRM
Vinod Krishnan [Fri, 16 May 2014 01:44:21 +0000 (01:44 +0000)]
am
035839c6: Adding Feature for HRM
* commit '
035839c6c291e831c51eea1e9d8b54f9e2382707':
Adding Feature for HRM
Andy Hung [Thu, 15 May 2014 03:21:00 +0000 (03:21 +0000)]
Merge "Allow OMX pointer types to be forced to 32 bits"
Nick Kralevich [Tue, 13 May 2014 20:41:41 +0000 (20:41 +0000)]
am
449e0dbe: am
fc1b9fa3: am
b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created."
* commit '
449e0dbe94126553c96cece21da54b40a6880f11':
Ensure that app lib symlinks are correctly labeled when created.
Nick Kralevich [Tue, 13 May 2014 20:38:20 +0000 (20:38 +0000)]
am
fc1b9fa3: am
b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created."
* commit '
fc1b9fa3178d1452629d75e2afa1a9d72f03fc1c':
Ensure that app lib symlinks are correctly labeled when created.
Nick Kralevich [Tue, 13 May 2014 20:35:38 +0000 (20:35 +0000)]
am
b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created."
* commit '
b66ee6c32d87961d5b9f0be97b5fdccb928fd453':
Ensure that app lib symlinks are correctly labeled when created.
Nick Kralevich [Tue, 13 May 2014 20:32:19 +0000 (20:32 +0000)]
Merge "Ensure that app lib symlinks are correctly labeled when created."
Stephen Smalley [Tue, 13 May 2014 16:53:07 +0000 (12:53 -0400)]
Ensure that app lib symlinks are correctly labeled when created.
At present, the app lib symlinks are created before setting
the package directory security context, and therefore default
to system_data_file. Upon a later restorecon_recursive,
they are relabeled to the same type as the package directory,
e.g. app_data_file. Avoid this inconsistency by setting the
package directory security context before creating the symlink
so that it inherits the same security context.
Change-Id: I1ee6ccd8a2aa63a4d2efda67f313c97932235911
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Vinod Krishnan [Wed, 7 May 2014 05:01:37 +0000 (22:01 -0700)]
Adding Feature for HRM
Change-Id: Iaec58df9c27753ce2c39c6bbe3735f1894684cb5
Aravind Akella [Tue, 13 May 2014 00:54:50 +0000 (00:54 +0000)]
am
47d871b2: am
d35e3af0: Set default values for FifoMaxEventCount and ReservedEventCount.
* commit '
47d871b2795f714499a34ffe85b67f8577883f7b':
Set default values for FifoMaxEventCount and ReservedEventCount.
Aravind Akella [Tue, 13 May 2014 00:50:40 +0000 (00:50 +0000)]
am
d35e3af0: Set default values for FifoMaxEventCount and ReservedEventCount.
* commit '
d35e3af04d4b7e850a3b87b2211d1a3993f9b76f':
Set default values for FifoMaxEventCount and ReservedEventCount.
Aravind Akella [Tue, 13 May 2014 00:14:56 +0000 (17:14 -0700)]
Set default values for FifoMaxEventCount and ReservedEventCount.
Change-Id: I4f610c2912ffe1697d1ffb99c556d1c88578466e
Etienne Le Grand [Mon, 12 May 2014 19:38:13 +0000 (19:38 +0000)]
Merge "Add wake gesture in Sensor.cpp"
Greg Hackmann [Mon, 12 May 2014 18:18:47 +0000 (18:18 +0000)]
am
38c9e132: am
c1ffd351: am
bd20e551: Merge "Use asynchronous lock/unlock API"
* commit '
38c9e1327a5b24267c3dab5293bc9d7ada6e9fc9':
Use asynchronous lock/unlock API
Greg Hackmann [Mon, 12 May 2014 18:12:34 +0000 (18:12 +0000)]
am
c1ffd351: am
bd20e551: Merge "Use asynchronous lock/unlock API"
* commit '
c1ffd351bc44483369271c11dd4c6391bba8c64c':
Use asynchronous lock/unlock API
Greg Hackmann [Mon, 12 May 2014 18:08:13 +0000 (18:08 +0000)]
am
bd20e551: Merge "Use asynchronous lock/unlock API"
* commit '
bd20e551f64234142e1146f9fa4b2dcebbd72122':
Use asynchronous lock/unlock API
Greg Hackmann [Mon, 12 May 2014 18:01:59 +0000 (18:01 +0000)]
Merge "Use asynchronous lock/unlock API"
Francis Hart [Tue, 1 Apr 2014 12:30:53 +0000 (15:30 +0300)]
Use asynchronous lock/unlock API
The gralloc API now provides a way for using lock/unlock with the Android
explicit synchronisation concept. This changes updates the GraphicBuffer class
to also expose this functionality, and updates the Surface class to make use of
in line with the dequeueBuffer/queueBuffer mechanism.
This new behaviour is dependent on GRALLOC_MODULE_API_VERSION_0_3. If the local
gralloc module does not support this then the existing synchronous lock/unlock
mechanism will be used.
Change-Id: I8c3fd9592e0c5400ac9be84450f55a77cc0bbdc5
Greg Hackmann [Fri, 9 May 2014 22:00:04 +0000 (22:00 +0000)]
am
9493d492: am
9eb142e3: am
a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""
* commit '
9493d4924a59f14b698389386337a9c07a7ea3c4':
Revert "Use asynchronous lock/unlock API"
Greg Hackmann [Fri, 9 May 2014 21:54:48 +0000 (21:54 +0000)]
am
4b46776f: am
8a6cd189: am
f60564a1: Merge "Use asynchronous lock/unlock API"
* commit '
4b46776ff88c5a365700b88e8b2b04e1b2c77e6e':
Use asynchronous lock/unlock API
Greg Hackmann [Fri, 9 May 2014 21:51:51 +0000 (21:51 +0000)]
am
9eb142e3: am
a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""
* commit '
9eb142e34a5bc11508c0bd6f60ad3933c60aa530':
Revert "Use asynchronous lock/unlock API"
Greg Hackmann [Fri, 9 May 2014 21:46:44 +0000 (21:46 +0000)]
am
a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""
* commit '
a9d49f99e69d8fc0e60b492b131322c96f47a232':
Revert "Use asynchronous lock/unlock API"
Greg Hackmann [Fri, 9 May 2014 21:39:07 +0000 (21:39 +0000)]
Merge "Revert "Use asynchronous lock/unlock API""
Greg Hackmann [Fri, 9 May 2014 21:36:48 +0000 (21:36 +0000)]
Revert "Use asynchronous lock/unlock API"
This reverts commit
378ef07760eda717367d9429428c42d54d54d9a7.
Change-Id: I1de5ab973b5383633e75924fe90ac3ca8216c36a
Greg Hackmann [Fri, 9 May 2014 21:13:16 +0000 (21:13 +0000)]
am
8a6cd189: am
f60564a1: Merge "Use asynchronous lock/unlock API"
* commit '
8a6cd189034ec4709a66e581b41deba56c028291':
Use asynchronous lock/unlock API
Greg Hackmann [Fri, 9 May 2014 21:08:39 +0000 (21:08 +0000)]
am
f60564a1: Merge "Use asynchronous lock/unlock API"
* commit '
f60564a13e917877c76c99294194a621d872076b':
Use asynchronous lock/unlock API
Greg Hackmann [Fri, 9 May 2014 21:02:20 +0000 (21:02 +0000)]
Merge "Use asynchronous lock/unlock API"
Andy McFadden [Fri, 9 May 2014 18:00:54 +0000 (18:00 +0000)]
am
39cde06a: (-s ours) am
b6601961: Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev
* commit '
39cde06aee5bc9338b1ed26513233cb54e9b446d':
DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
Andy McFadden [Fri, 9 May 2014 17:57:12 +0000 (17:57 +0000)]
am
b6601961: Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev
* commit '
b66019615da8750588f1233a77b9c686b0a248c3':
DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
Andy McFadden [Fri, 9 May 2014 17:54:29 +0000 (17:54 +0000)]
Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev
Andy McFadden [Fri, 9 May 2014 17:49:32 +0000 (17:49 +0000)]
Merge "Add "dumpsys SurfaceFlinger --dispsync""
Andy McFadden [Thu, 8 May 2014 21:53:26 +0000 (14:53 -0700)]
DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
Dumps the current DispSync state.
Bug
14651879
(this is a near-cherrypick of Ide4e6dbd58b117bc1a6b97b57d10cd92ec86dc84)
Change-Id: I6e6c8452ede5c2d5098db1b884d28226e77d9a03
Eino-Ville Talvala [Fri, 9 May 2014 15:55:44 +0000 (15:55 +0000)]
am
127b798f: (-s ours) am
0b42423c: DO NOT MERGE: Add standard android.hardware.camera.external permission file.
* commit '
127b798ff9bd6a76c3a5a8816b59a92586e355d3':
DO NOT MERGE: Add standard android.hardware.camera.external permission file.
Eino-Ville Talvala [Fri, 9 May 2014 15:48:02 +0000 (15:48 +0000)]
am
0b42423c: DO NOT MERGE: Add standard android.hardware.camera.external permission file.
* commit '
0b42423c59a12674d954079a9eb1f58a55fc55a6':
DO NOT MERGE: Add standard android.hardware.camera.external permission file.
Andy McFadden [Thu, 8 May 2014 21:53:26 +0000 (14:53 -0700)]
Add "dumpsys SurfaceFlinger --dispsync"
Dumps the current DispSync state.
Bug
14651879
Change-Id: Ide4e6dbd58b117bc1a6b97b57d10cd92ec86dc84
Andy McFadden [Thu, 8 May 2014 23:10:31 +0000 (23:10 +0000)]
Merge "Add mutex"
Andy McFadden [Thu, 8 May 2014 21:56:50 +0000 (14:56 -0700)]
Add mutex
Change-Id: I81072031e74a5cca8384e4e8bce4babf2187d8bb
Eino-Ville Talvala [Thu, 8 May 2014 18:43:53 +0000 (11:43 -0700)]
DO NOT MERGE: Add standard android.hardware.camera.external permission file.
Any device that lists the android.hardware.camera.external feature
must also list android.hardware.camera.any feature.
Change-Id: I7accd27501e66e99a8addaeed890df709208fd13
Eino-Ville Talvala [Thu, 8 May 2014 21:33:54 +0000 (21:33 +0000)]
Merge "Add standard android.hardware.camera.external permission file."
Eino-Ville Talvala [Thu, 8 May 2014 18:43:53 +0000 (11:43 -0700)]
Add standard android.hardware.camera.external permission file.
Any device that lists the android.hardware.camera.external feature
must also list android.hardware.camera.any feature.
Change-Id: I7accd27501e66e99a8addaeed890df709208fd13
Ying Wang [Thu, 8 May 2014 18:23:58 +0000 (18:23 +0000)]
am
114d71ce: am
214b4a61: am
8155ce81: Merge "Remove unused LOCAL_LDLIBS."
* commit '
114d71ce7c6ec1ce0327c812a42966c4258b4a46':
Remove unused LOCAL_LDLIBS.
Etienne Le Grand [Thu, 8 May 2014 02:49:05 +0000 (19:49 -0700)]
Add wake gesture in Sensor.cpp
Change-Id: Ifb1744acffc2d57da43112fb9966261e8246d6de
Ying Wang [Wed, 7 May 2014 23:01:19 +0000 (23:01 +0000)]
am
214b4a61: am
8155ce81: Merge "Remove unused LOCAL_LDLIBS."
* commit '
214b4a61ac3fa63e35c79157d3acf0d8b692b3ac':
Remove unused LOCAL_LDLIBS.
Ying Wang [Wed, 7 May 2014 22:54:27 +0000 (22:54 +0000)]
am
8155ce81: Merge "Remove unused LOCAL_LDLIBS."
* commit '
8155ce81d4b150e6e453d9443f9fea4cc2c546d2':
Remove unused LOCAL_LDLIBS.
Ying Wang [Wed, 7 May 2014 22:48:40 +0000 (22:48 +0000)]
Merge "Remove unused LOCAL_LDLIBS."