Commit Graph

50622 Commits

Author SHA1 Message Date
Simon Wilson
90654afb3a Revert "Enable OMAP4 SGX workaround for OMAP3 too"
Since the new TI SGX DDK 1.12 has fixed support for RGBA8888,
the workaround can be reverted. This may help with CTS issues.

Bug: 14995811
This reverts commit 6e79cb81d0.

Change-Id: Id8160ebe577d7009d2dd5eb4501ec40356a4274d
2014-05-29 08:55:27 -07:00
Brian Carlstrom
aefe55f0fb Remove dependencies on runtime_libdvm and libdvm.so in general
Bug: 14298175
Change-Id: I74b4a3dabf89c6b53bfe688c45d6e1167880fd95
2014-05-28 21:27:47 -07:00
Elliott Hughes
3e54077d42 am e77cb931: am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit 'e77cb9317de54ea0041eeef7966b818257158f64':
  Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
2014-05-29 01:08:06 +00:00
Elliott Hughes
e77cb9317d am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '259c25080d8b7f3b66e27e4d8ac3a268738ebe3f':
  Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
2014-05-29 01:04:28 +00:00
Elliott Hughes
259c25080d am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '03e2f8fa13a791d744758ec9ffe27f52cab730d0':
  Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
2014-05-29 01:02:16 +00:00
Elliott Hughes
03e2f8fa13 Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC." 2014-05-29 00:59:01 +00:00
Brian Carlstrom
4b0af48a21 am 28ec0303: am e67810fd: am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '28ec03035d61828047f6bbc57be3b71f4c57b7fb':
  Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 23:18:49 +00:00
Brian Carlstrom
28ec03035d am e67810fd: am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit 'e67810fd7a00ffa92337c6f3aa6114136ce12613':
  Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 23:13:27 +00:00
Brian Carlstrom
e67810fd7a am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '97a51ad44ae3dcf4976076382923ddcae16233ee':
  Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 22:31:43 +00:00
Brian Carlstrom
97a51ad44a Merge "Move to dalvik.vm.lib.2 to force default to libart" 2014-05-28 22:28:41 +00:00
Brian Carlstrom
856bc78efc Move to dalvik.vm.lib.2 to force default to libart
Bug: 14298175

(cherry picked from commit c4ac3124ff)

Change-Id: I97cc3ff7a269e671b315afa8673dae43d1f86bf1
2014-05-28 14:48:36 -07:00
Brian Carlstrom
96d34ff2c3 am c4ac3124: Move to dalvik.vm.lib.2 to force default to libart
* commit 'c4ac3124ffb51f13bb4206e9f8452a3712eb09cb':
  Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 21:44:58 +00:00
Brigid Smith
750aa9743c Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Bug: 15116468
Change-Id: I621532fb53b8317f5a513edfbeb0c50c265342fc
2014-05-28 14:42:09 -07:00
Brian Carlstrom
c4ac3124ff Move to dalvik.vm.lib.2 to force default to libart
Bug: 14298175
Change-Id: Id3892a32848fb22fbf4c2861218b51f68e830b34
2014-05-28 14:31:47 -07:00
Dan Stoza
3d5c8a98c1 Merge "SurfaceFlinger: Add sourceCrop to screenshot" 2014-05-28 18:31:40 +00:00
Santos Cordon
7eb2a1566a am 203fe88e: (-s ours) DO NOT MERGE Allow "telecomm" service to be registered with the phone UID.
* commit '203fe88ed8a47a370d07d69d14db2fb58f5a26ee':
  DO NOT MERGE Allow "telecomm" service to be registered with the phone UID.
2014-05-28 18:20:13 +00:00
The Android Automerger
104513804e am cfe99e79: merge in master-release history after reset to 102a072d90
* commit 'cfe99e79a6ae4d9fd08d09ecd66cee5da8a5fb95':
  frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
  releax wait timeout on start of dumpstate service
2014-05-28 18:20:13 +00:00
Santos Cordon
203fe88ed8 DO NOT MERGE Allow "telecomm" service to be registered with the phone UID.
Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
(cherry picked from commit 3fb4de7193)
2014-05-28 04:50:04 +00:00
Jesse Hall
c2774f9b73 am 92374318: am 618c78c0: am dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"
* commit '92374318b82945f3d03461f3d0c659adb8409fc5':
  EGL: add x86/64 assembly code for EGL/GLES wrappers
2014-05-27 23:35:10 +00:00
Jesse Hall
92374318b8 am 618c78c0: am dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"
* commit '618c78c032ce84c02724a1e5a7f439fa788ecf3a':
  EGL: add x86/64 assembly code for EGL/GLES wrappers
2014-05-27 23:31:32 +00:00
Jesse Hall
618c78c032 am dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"
* commit 'dc2736219fa897840d1ff12b11cd7defb636f845':
  EGL: add x86/64 assembly code for EGL/GLES wrappers
2014-05-27 23:29:20 +00:00
Jesse Hall
dc2736219f Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers" 2014-05-27 23:26:15 +00:00
Aravind Akella
812f15f2f9 Merge "Surface maxDelay and isWakeUpSensor flag in Sensor.java." 2014-05-27 19:38:00 +00:00
Etienne Le Grand
03b1a9db9d am b3a65bb0: am 9dcd38ad: Merge "Add heart rate to ASensorEvent" into klp-modular-dev
* commit 'b3a65bb0c2d2f6e660510efe0d93b3d26b0b2bf9':
  Add heart rate to ASensorEvent
2014-05-27 18:14:51 +00:00
Etienne Le Grand
b3a65bb0c2 am 9dcd38ad: Merge "Add heart rate to ASensorEvent" into klp-modular-dev
* commit '9dcd38ad3b8335308b59932718e3f145aa50d318':
  Add heart rate to ASensorEvent
2014-05-27 18:10:16 +00:00
Etienne Le Grand
9dcd38ad3b Merge "Add heart rate to ASensorEvent" into klp-modular-dev 2014-05-27 18:02:49 +00:00
mwajdecz
c80aafa61d EGL: add x86/64 assembly code for EGL/GLES wrappers
There was no explicit support for x86/64 architecture in EGL/GLES wrappers.
This resulted either in failures or sub-optimal implementation of the wrapper functions.

Change-Id: I20d99d7372fbf642ee4b94a05c8cb971cba29988
Signed-off-by: Wajdeczko, Michal <michal.wajdeczko@intel.com>
2014-05-27 09:26:21 -07:00
Aravind Akella
d9441e4c27 Surface maxDelay and isWakeUpSensor flag in Sensor.java.
Change-Id: Idd1e9045190beeca87b086b272e8cbf0bed05bae
2014-05-23 18:58:01 -07:00
Etienne Le Grand
630e31d6ed Add heart rate to ASensorEvent
Change-Id: Ic82838b17a575de93d499e44a454bb382f17678f
2014-05-23 12:35:10 -07:00
Aravind Akella
72c524dd8c am 040730e8: am 1236710b: Remove getRequiredPermission from NDK.
* commit '040730e8954b2f686390434646f82bc333de7058':
  Remove getRequiredPermission from NDK.
2014-05-23 18:04:27 +00:00
Dan Stoza
c18790018b SurfaceFlinger: Add sourceCrop to screenshot
Adds a sourceCrop Rect parameter to screenshot commands, which allows
clients to capture only a portion of the screen instead of the whole
screen.

Bug: 15137922
Change-Id: I629447573cd34ffb96334cde7ba02490b9ea06d8
2014-05-23 09:19:03 -07:00
Aravind Akella
040730e895 am 1236710b: Remove getRequiredPermission from NDK.
* commit '1236710bccd8f5870c0281e24a899c3d58f708e6':
  Remove getRequiredPermission from NDK.
2014-05-22 22:44:55 +00:00
Santos Cordon
9bf29a81df Merge "Allow "telecomm" service to be registered with the phone UID." 2014-05-22 21:21:29 +00:00
Aravind Akella
1236710bcc Remove getRequiredPermission from NDK.
Change-Id: Ic967adde89f30261c75fca67c09d14d35bd1cdb3
2014-05-22 13:19:49 -07:00
The Android Automerger
cfe99e79a6 merge in master-release history after reset to 102a072d90 2014-05-22 07:22:05 -07:00
The Android Automerger
30fc16db37 merge in master-release history after reset to fca1b54031 2014-05-22 05:50:26 -07:00
Santos Cordon
3fb4de7193 Allow "telecomm" service to be registered with the phone UID.
Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
2014-05-21 22:59:41 -07:00
Jesse Hall
102a072d90 Merge "opengl: Fix include style in generated JNI code" 2014-05-22 04:43:19 +00:00
Jesse Hall
72aa92381a Merge "opengl: Un-hide GLES31 and GLES31Ext classes" 2014-05-22 04:42:20 +00:00
Jesse Hall
6487b67d8e Merge "opengl: Add GLES31 and GLES31Ext class templates" 2014-05-22 04:41:54 +00:00
Jesse Hall
fca1b54031 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
2014-05-21 15:32:23 -07:00
Jesse Hall
d6061de255 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
2014-05-21 15:24:38 -07:00
Jesse Hall
3667e33862 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
2014-05-21 15:12:42 -07:00
Jesse Hall
0a4d08e560 Merge "opengl: Update GLES headers and generate *.in from registry XML" 2014-05-21 22:03:44 +00:00
Jesse Hall
3703f7f014 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
2014-05-21 14:58:00 -07:00
The Android Automerger
5462979df4 merge in master-release history after reset to b9e879d429 2014-05-21 05:50:22 -07:00
Jeff Brown
b9e879d429 Merge "Support VIRTUAL flag in keyboard layouts." 2014-05-21 02:34:36 +00:00
Jeff Brown
5a7d2f9a15 Support VIRTUAL flag in keyboard layouts.
This flag is used to provide haptic feedback for virtual hard keys.

Bug: 14319563
Change-Id: Ia0ca1acc8cfa00a42d1c04d279dfa59c6cc00f4d
2014-05-20 17:29:30 -07:00
Andy McFadden
f79fcdb19a Merge "Add IMPLEMENTATION_DEFINED to dump" 2014-05-20 22:29:49 +00:00
Jesse Hall
df7d661533 Merge "Revert "Update GLES headers from Khronos SVN r26322"" 2014-05-20 21:59:37 +00:00