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
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
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
Etienne Le Grand
630e31d6ed
Add heart rate to ASensorEvent
...
Change-Id: Ic82838b17a575de93d499e44a454bb382f17678f
2014-05-23 12:35:10 -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
Aravind Akella
1236710bcc
Remove getRequiredPermission from NDK.
...
Change-Id: Ic967adde89f30261c75fca67c09d14d35bd1cdb3
2014-05-22 13:19:49 -07:00
Ben Murdoch
2bb7438c8e
am c210aec4
: Merge "Add android.software.webview software feature." into klp-modular-dev
...
* commit 'c210aec479e2e3e2a5e7f355f28fe9625a23f707':
Add android.software.webview software feature.
2014-05-20 09:35:34 +00:00
Ben Murdoch
c210aec479
Merge "Add android.software.webview software feature." into klp-modular-dev
2014-05-20 09:31:59 +00:00
Ben Murdoch
26e7b3df10
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
2014-05-19 11:05:27 +00:00
Narayan Kamath
f8c66b4bee
am cfba3bf1
: am c9fcaf37
: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
...
* commit 'cfba3bf1606dfdb1daf1be1c19176180660ae19d':
Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:10:21 +00:00
Narayan Kamath
cfba3bf160
am c9fcaf37
: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
...
* commit 'c9fcaf3751af078ad730913304431197e4d1ae80':
Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:08:06 +00:00
Narayan Kamath
c9fcaf3751
Merge "Change InputMessage.motion.pointerSize to a uint32_t."
2014-05-16 12:06:11 +00:00
Narayan Kamath
ed5fd384b7
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 bc6001b026
)
Change-Id: I28e87050478920a54132efbbb8138076ebad1409
2014-05-16 12:53:16 +01:00
Vinod Krishnan
bd0f91537b
am 7e6c5336
: Merge "Adding a portrait and landscape file" into klp-modular-dev
...
* commit '7e6c53366d916e11fd6237c9456c394ff6a1cb1f':
Adding a portrait and landscape file
2014-05-16 02:44:10 +00:00
Vinod Krishnan
7e6c53366d
Merge "Adding a portrait and landscape file" into klp-modular-dev
2014-05-16 02:41:09 +00:00
Vinod Krishnan
0029ecbb9b
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
2014-05-15 19:24:18 -07:00
Vinod Krishnan
b017932e4a
am 035839c6
: Adding Feature for HRM
...
* commit '035839c6c291e831c51eea1e9d8b54f9e2382707':
Adding Feature for HRM
2014-05-16 01:44:21 +00:00
Nick Kralevich
449e0dbe94
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.
2014-05-13 20:38:20 +00:00
Nick Kralevich
fc1b9fa317
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.
2014-05-13 20:35:38 +00:00
Nick Kralevich
b66ee6c32d
Merge "Ensure that app lib symlinks are correctly labeled when created."
2014-05-13 20:32:19 +00:00
Stephen Smalley
3a98389263
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>
2014-05-13 12:59:40 -04:00
Vinod Krishnan
035839c6c2
Adding Feature for HRM
...
Change-Id: Iaec58df9c27753ce2c39c6bbe3735f1894684cb5
2014-05-12 18:05:38 -07:00
Aravind Akella
47d871b279
am d35e3af0
: Set default values for FifoMaxEventCount and ReservedEventCount.
...
* commit 'd35e3af04d4b7e850a3b87b2211d1a3993f9b76f':
Set default values for FifoMaxEventCount and ReservedEventCount.
2014-05-13 00:50:40 +00:00
Aravind Akella
d35e3af04d
Set default values for FifoMaxEventCount and ReservedEventCount.
...
Change-Id: I4f610c2912ffe1697d1ffb99c556d1c88578466e
2014-05-12 17:15:59 -07:00
Greg Hackmann
38c9e1327a
am c1ffd351
: am bd20e551
: Merge "Use asynchronous lock/unlock API"
...
* commit 'c1ffd351bc44483369271c11dd4c6391bba8c64c':
Use asynchronous lock/unlock API
2014-05-12 18:12:34 +00:00
Greg Hackmann
c1ffd351bc
am bd20e551
: Merge "Use asynchronous lock/unlock API"
...
* commit 'bd20e551f64234142e1146f9fa4b2dcebbd72122':
Use asynchronous lock/unlock API
2014-05-12 18:08:13 +00:00
Greg Hackmann
bd20e551f6
Merge "Use asynchronous lock/unlock API"
2014-05-12 18:02:00 +00:00
Francis Hart
8f3960179c
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
2014-05-12 09:13:03 -07:00
Greg Hackmann
9493d4924a
am 9eb142e3
: am a9d49f99
: Merge "Revert "Use asynchronous lock/unlock API""
...
* commit '9eb142e34a5bc11508c0bd6f60ad3933c60aa530':
Revert "Use asynchronous lock/unlock API"
2014-05-09 21:51:51 +00:00
Greg Hackmann
9eb142e34a
am a9d49f99
: Merge "Revert "Use asynchronous lock/unlock API""
...
* commit 'a9d49f99e69d8fc0e60b492b131322c96f47a232':
Revert "Use asynchronous lock/unlock API"
2014-05-09 21:46:44 +00:00
Greg Hackmann
a9d49f99e6
Merge "Revert "Use asynchronous lock/unlock API""
2014-05-09 21:39:07 +00:00
Greg Hackmann
53ec72523a
Revert "Use asynchronous lock/unlock API"
...
This reverts commit 378ef07760
.
Change-Id: I1de5ab973b5383633e75924fe90ac3ca8216c36a
2014-05-09 21:36:48 +00:00
Greg Hackmann
4b46776ff8
am 8a6cd189
: am f60564a1
: Merge "Use asynchronous lock/unlock API"
...
* commit '8a6cd189034ec4709a66e581b41deba56c028291':
Use asynchronous lock/unlock API
2014-05-09 21:13:16 +00:00
Greg Hackmann
8a6cd18903
am f60564a1
: Merge "Use asynchronous lock/unlock API"
...
* commit 'f60564a13e917877c76c99294194a621d872076b':
Use asynchronous lock/unlock API
2014-05-09 21:08:39 +00:00
Greg Hackmann
f60564a13e
Merge "Use asynchronous lock/unlock API"
2014-05-09 21:02:21 +00:00
Andy McFadden
39cde06aee
am b6601961
: Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev
...
* commit 'b66019615da8750588f1233a77b9c686b0a248c3':
DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
2014-05-09 17:57:12 +00:00
Andy McFadden
b66019615d
Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev
2014-05-09 17:54:29 +00:00
Andy McFadden
232f5bc675
DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
...
Dumps the current DispSync state.
Bug 14651879
(this is a near-cherrypick of Ide4e6dbd58b117bc1a6b97b57d10cd92ec86dc84)
Change-Id: I6e6c8452ede5c2d5098db1b884d28226e77d9a03
2014-05-09 10:49:11 -07:00
Eino-Ville Talvala
127b798ff9
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.
2014-05-09 15:48:02 +00:00
Eino-Ville Talvala
0b42423c59
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
2014-05-08 21:48:57 +00:00
Ying Wang
114d71ce7c
am 214b4a61
: am 8155ce81
: Merge "Remove unused LOCAL_LDLIBS."
...
* commit '214b4a61ac3fa63e35c79157d3acf0d8b692b3ac':
Remove unused LOCAL_LDLIBS.
2014-05-07 23:01:19 +00:00
Ying Wang
214b4a61ac
am 8155ce81
: Merge "Remove unused LOCAL_LDLIBS."
...
* commit '8155ce81d4b150e6e453d9443f9fea4cc2c546d2':
Remove unused LOCAL_LDLIBS.
2014-05-07 22:54:27 +00:00
Ying Wang
8155ce81d4
Merge "Remove unused LOCAL_LDLIBS."
2014-05-07 22:48:40 +00:00