OSDN Git Service
Jesse Hall [Tue, 25 Feb 2014 21:57:51 +0000 (21:57 +0000)]
am
9d65631f: am
c9bf3ba4: Merge "Virtual Display async mode is overridden"
* commit '
9d65631f5de153b50331d9f63225fe60ba70f8bc':
Virtual Display async mode is overridden
Jesse Hall [Tue, 25 Feb 2014 21:51:10 +0000 (21:51 +0000)]
am
c9bf3ba4: Merge "Virtual Display async mode is overridden"
* commit '
c9bf3ba411c66dd1d977c81f1aca08109cbf8c86':
Virtual Display async mode is overridden
Jesse Hall [Tue, 25 Feb 2014 21:43:09 +0000 (21:43 +0000)]
Merge "Virtual Display async mode is overridden"
Narayan Kamath [Tue, 25 Feb 2014 13:17:12 +0000 (13:17 +0000)]
am
aa01ad91: am
aaa27fd5: Merge "Use reinterpret_cast when an integer is cast to a pointer"
* commit '
aa01ad91cd22304fd15810f241c67ebb59e90c04':
Use reinterpret_cast when an integer is cast to a pointer
Narayan Kamath [Tue, 25 Feb 2014 13:17:11 +0000 (13:17 +0000)]
am
097b5991: am
e5c99bf3: Merge "Use long for pointers in opengl/EGL classes"
* commit '
097b59919f01d7b057d252d23cb96ce5fcdd9469':
Use long for pointers in opengl/EGL classes
Narayan Kamath [Tue, 25 Feb 2014 13:10:53 +0000 (13:10 +0000)]
am
aaa27fd5: Merge "Use reinterpret_cast when an integer is cast to a pointer"
* commit '
aaa27fd5a0bb81ac17c25c33beb2656b32100cd6':
Use reinterpret_cast when an integer is cast to a pointer
Narayan Kamath [Tue, 25 Feb 2014 13:10:53 +0000 (13:10 +0000)]
am
e5c99bf3: Merge "Use long for pointers in opengl/EGL classes"
* commit '
e5c99bf38001d86ca41dfc51fac337aa6a6931f4':
Use long for pointers in opengl/EGL classes
Narayan Kamath [Tue, 25 Feb 2014 13:05:49 +0000 (13:05 +0000)]
Merge "Use reinterpret_cast when an integer is cast to a pointer"
Narayan Kamath [Tue, 25 Feb 2014 13:05:45 +0000 (13:05 +0000)]
Merge "Use long for pointers in opengl/EGL classes"
Arve Hjønnevåg [Tue, 25 Feb 2014 00:14:42 +0000 (00:14 +0000)]
am
fe648b4b: am
ead79b83: Merge "Binder: Make sure binder objects do not overlap"
* commit '
fe648b4bf346f837a6ff554ab44fedb203b86966':
Binder: Make sure binder objects do not overlap
Arve Hjønnevåg [Tue, 25 Feb 2014 00:06:50 +0000 (00:06 +0000)]
am
ead79b83: Merge "Binder: Make sure binder objects do not overlap"
* commit '
ead79b8365ea33eb0e21a817d5ca563ee1eb56be':
Binder: Make sure binder objects do not overlap
Arve Hjønnevåg [Tue, 25 Feb 2014 00:01:53 +0000 (00:01 +0000)]
Merge "Binder: Make sure binder objects do not overlap"
Arve Hjønnevåg [Fri, 14 Feb 2014 03:22:08 +0000 (19:22 -0800)]
Binder: Make sure binder objects do not overlap
Fixes crashing part of bug
11355082.
The driver still leaks references.
Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071
Ashok Bhat [Sat, 15 Feb 2014 12:51:43 +0000 (12:51 +0000)]
Use reinterpret_cast when an integer is cast to a pointer
Change-Id: I5adcd59f58c029f7b2b596f4826d8ea69fb9bba6
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Ashok Bhat [Thu, 13 Feb 2014 09:47:18 +0000 (09:47 +0000)]
Use long for pointers in opengl/EGL classes
EGL classes in frameworks/base have to be updated to support
64-bit platforms. Key changes in the EGL classes include
[x] EGLObjectHandle class - EGLObjectHandle class has two public
methods (constructor and getHandle) that assume handles are
32-bit. They have not been changed. Instead, two new hidden
methods (EGLObjectHandle(long) and getNativeHandle) have been
added.
[x] EG14 class - Two public methods eglGetDisplay and
eglCreatePbufferFromClientBuffer assume that handles are 32-bit.
They have been changed to throw unsupported operation exception
on non 32-bit machines. Two new methods eglGetDisplay(long)
and eglCreatePbufferFromClientBuffer(...long buffer..) have
been added to support 64-bit handles.
To allow the above changes in frameworks/base EGL classes,
corresponding code generation mechanism in frameworks/native has
been updated.
Change-Id: I5d0a62e10c20ccf05f610d6608b8dfb6414b5116
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Arve Hjønnevåg [Sat, 22 Feb 2014 00:52:18 +0000 (00:52 +0000)]
am
c5294424: am
d1c87d37: Merge changes I3432d9d3,I90fcf538,I64398603
* commit '
c5294424386bedad2a240074d0845999f28e662d':
Binder: Fix some valgrind errors.
Binder: Don't cast directly from a pointer to binder_uintptr_t
Binder: Disable attemptIncStrongHandle
Arve Hjønnevåg [Sat, 22 Feb 2014 00:41:31 +0000 (00:41 +0000)]
am
d1c87d37: Merge changes I3432d9d3,I90fcf538,I64398603
* commit '
d1c87d37025c49f6a47fe43328572da495ff04c1':
Binder: Fix some valgrind errors.
Binder: Don't cast directly from a pointer to binder_uintptr_t
Binder: Disable attemptIncStrongHandle
John Dong [Fri, 21 Feb 2014 20:37:59 +0000 (12:37 -0800)]
Virtual Display async mode is overridden
Virtual Display async setting is overridden by eglApi.c causing
stall during composition.
Set the async mode after eglCreateWindowSurface()
b/
13139121
Change-Id: I336ca145552e387217cd8bea6e4b7f5f490a274d
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Arve Hjønnevåg [Fri, 21 Feb 2014 23:45:01 +0000 (23:45 +0000)]
Merge changes I3432d9d3,I90fcf538,I64398603
* changes:
Binder: Fix some valgrind errors.
Binder: Don't cast directly from a pointer to binder_uintptr_t
Binder: Disable attemptIncStrongHandle
Narayan Kamath [Fri, 21 Feb 2014 16:54:17 +0000 (16:54 +0000)]
am
25a57171: am
9076fa78: Merge "Update EGL codegen to be in sync with frameworks/base"
* commit '
25a571718ce9b8b0a1c3738845e9af4b9f3d1816':
Update EGL codegen to be in sync with frameworks/base
Narayan Kamath [Fri, 21 Feb 2014 16:54:17 +0000 (16:54 +0000)]
am
9b0d5ffb: am
f56ae199: Merge "Update GLES codegen to be in sync with frameworks/base"
* commit '
9b0d5ffbb6cc847843e7f5ae7f891000c90a5989':
Update GLES codegen to be in sync with frameworks/base
Narayan Kamath [Fri, 21 Feb 2014 16:42:50 +0000 (16:42 +0000)]
am
9076fa78: Merge "Update EGL codegen to be in sync with frameworks/base"
* commit '
9076fa78d2541fa14253aaf08e6445fafa17e35b':
Update EGL codegen to be in sync with frameworks/base
Narayan Kamath [Fri, 21 Feb 2014 16:42:49 +0000 (16:42 +0000)]
am
f56ae199: Merge "Update GLES codegen to be in sync with frameworks/base"
* commit '
f56ae1999948393ba8c207525d6466ee424c4467':
Update GLES codegen to be in sync with frameworks/base
Narayan Kamath [Fri, 21 Feb 2014 14:27:35 +0000 (14:27 +0000)]
Merge "Update EGL codegen to be in sync with frameworks/base"
Narayan Kamath [Fri, 21 Feb 2014 14:27:16 +0000 (14:27 +0000)]
Merge "Update GLES codegen to be in sync with frameworks/base"
Colin Cross [Fri, 21 Feb 2014 13:54:24 +0000 (13:54 +0000)]
am
361d9df3: am
6b4ecf31: Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit"
* commit '
361d9df38cf9760baffc863d5364a1df9cf8be6b':
surfaceflinger: add BoardConfig.mk variable to force 32-bit
Colin Cross [Fri, 21 Feb 2014 00:22:18 +0000 (00:22 +0000)]
am
6b4ecf31: Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit"
* commit '
6b4ecf314461067c0e05130edaf785fb010f471a':
surfaceflinger: add BoardConfig.mk variable to force 32-bit
Colin Cross [Fri, 21 Feb 2014 00:15:58 +0000 (00:15 +0000)]
Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit"
Colin Cross [Thu, 20 Feb 2014 23:36:21 +0000 (15:36 -0800)]
surfaceflinger: add BoardConfig.mk variable to force 32-bit
Individual devices may need to force surfaceflinger to compile for
32-bit if they don't have 64-bit GL libraries.
Change-Id: I3703b2f8e36e90cf125d9ed5e6318c3506861948
Arve Hjønnevåg [Thu, 20 Feb 2014 21:27:53 +0000 (21:27 +0000)]
am
6f286114: Revert "Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface"
* commit '
6f286114ec1d597f3dae987bba6e72dbbc404e32':
Revert "Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface"
Patrick Tjin [Thu, 20 Feb 2014 20:51:13 +0000 (20:51 +0000)]
Merge "Add uid to sensorservice's dump of active connections"
Ashok Bhat [Thu, 13 Feb 2014 11:08:25 +0000 (11:08 +0000)]
Update GLES codegen to be in sync with frameworks/base
Patch from synergydev with commit-id
01994c79 changed
core/jni/com_google_android_gles_jni_GLImpl.cpp in the
frameworks/base. However the corresponding code snippet
in frameworks/native was not updated. This patch addresses
the issue.
Change-Id: I89c3d88de832efc8cbbe682c8a7ff7dfbef99db3
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Ashok Bhat [Thu, 13 Feb 2014 10:48:02 +0000 (10:48 +0000)]
Update EGL codegen to be in sync with frameworks/base
Patch from Takeshi Aimi with commit-id
f9337377 changed
core/jni/android_opengl_EGL14.cpp in the frameworks/base.
However the corresponding code snippet in frameworks/
native was not updated. This patch addresses the issue.
Change-Id: I40bcc43d36d7ab4e0db4a73556a4f7480c7431c1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Arve Hjønnevåg [Thu, 20 Feb 2014 14:59:14 +0000 (14:59 +0000)]
am
9b5c3b91: am
d5a354c6: am
d06f6b00: am
67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
* commit '
9b5c3b9132831ba9078fc7c4001821bcfe8dd39d':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
Arve Hjønnevåg [Thu, 20 Feb 2014 04:42:13 +0000 (20:42 -0800)]
Revert "Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface"
This branch has the new driver interface so it should not have this change.
This reverts commit
6790329358d1c84af2fe9ba093bcfc1c6176e758.
Change-Id: I9b6d0d653d98dbdb521ef964c5e7c2f14859d340
Dan Stoza [Thu, 20 Feb 2014 02:43:37 +0000 (02:43 +0000)]
Merge "Fix calls to captureScreen"
Dan Stoza [Thu, 20 Feb 2014 02:35:30 +0000 (18:35 -0800)]
Fix calls to captureScreen
Change-Id: Ic0ff47afa29f143131906082dff79d4e907b7143
Dan Stoza [Thu, 20 Feb 2014 00:56:34 +0000 (00:56 +0000)]
Merge "Allow disabling layer rotation during screenshots"
Arve Hjønnevåg [Thu, 20 Feb 2014 00:52:13 +0000 (00:52 +0000)]
am
d5a354c6: am
d06f6b00: am
67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
* commit '
d5a354c6b7f2ae0b93e018f3024a2fca5f6543a1':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
Arve Hjønnevåg [Thu, 20 Feb 2014 00:04:44 +0000 (00:04 +0000)]
am
d06f6b00: am
67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
* commit '
d06f6b001484c28a6ede3f1ad83d23dcb9ad3ccf':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
Arve Hjønnevåg [Thu, 20 Feb 2014 00:00:49 +0000 (00:00 +0000)]
am
67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
* commit '
6790329358d1c84af2fe9ba093bcfc1c6176e758':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
Arve Hjønnevåg [Wed, 19 Feb 2014 23:35:52 +0000 (15:35 -0800)]
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
DO NOT MERGE into any branch that uses the new interface
Change-Id: Id54308a89327e69a389ac5916c052ad97f57cb28
Arve Hjønnevåg [Wed, 19 Feb 2014 22:06:09 +0000 (22:06 +0000)]
am
7cc5b880: am
e45636a8: am
d437364e: am
f50b9eaa: Binder: Make sure binder objects do not overlap
* commit '
7cc5b8800c22790b0db9ea0af62fcad2cc998303':
Binder: Make sure binder objects do not overlap
Arve Hjønnevåg [Wed, 19 Feb 2014 21:50:15 +0000 (21:50 +0000)]
am
e45636a8: am
d437364e: am
f50b9eaa: Binder: Make sure binder objects do not overlap
* commit '
e45636a8674b9cbb9305648e21316210e1daf920':
Binder: Make sure binder objects do not overlap
Arve Hjønnevåg [Wed, 19 Feb 2014 21:47:35 +0000 (21:47 +0000)]
am
d437364e: am
f50b9eaa: Binder: Make sure binder objects do not overlap
* commit '
d437364ec156e07c5fbe3fa27a7cd55e5450e9f6':
Binder: Make sure binder objects do not overlap
Arve Hjønnevåg [Wed, 19 Feb 2014 21:45:25 +0000 (21:45 +0000)]
am
f50b9eaa: Binder: Make sure binder objects do not overlap
* commit '
f50b9eaaeeaeae16981f11b05d3f3a6fb0dea30d':
Binder: Make sure binder objects do not overlap
Andy McFadden [Wed, 19 Feb 2014 19:15:20 +0000 (19:15 +0000)]
Merge "Hide three malformed GL bindings"
Andy McFadden [Fri, 14 Feb 2014 21:05:53 +0000 (13:05 -0800)]
Hide three malformed GL bindings
They were replaced with correct bindings a while back, but the
broken methods weren't hidden.
Also, pick up two changes that were made to the generated code
rather than the source.
Bug
6006380
Change-Id: Ibfe9a5f2e13e745f8d82116d1b4d8c2d025ac830
Arve Hjønnevåg [Wed, 19 Feb 2014 05:10:29 +0000 (21:10 -0800)]
Binder: Fix some valgrind errors.
When using 64 bit binder pointers, only initializing the 32 bit
handle, in a stack allocated struct, will pass uninitialized stack
data to the kernel and other processes.
Change-Id: I3432d9d36bb251d8ddb0a863661aeb80aabb3d92
Arve Hjønnevåg [Wed, 19 Feb 2014 05:04:31 +0000 (21:04 -0800)]
Binder: Don't cast directly from a pointer to binder_uintptr_t
When using the 64 bit binder interface from a 32 bit process the
pointer may get sign extended and cause the kernel to fail to read
from it.
Change-Id: I90fcf53880e2aa92e230a9723f9b3f7696170e32
Andy McFadden [Wed, 19 Feb 2014 00:05:51 +0000 (00:05 +0000)]
am
22a5c8b2: (-s ours) am
44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE
* commit '
22a5c8b2e3c232a7cbe452759f20fc3c8382add7':
Allow "opaque" flag to be updated. DO NOT MERGE
Andy McFadden [Tue, 18 Feb 2014 23:59:43 +0000 (23:59 +0000)]
am
44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE
* commit '
44c35ec4a94eb33f7ee0df085c5d2d56d99962cf':
Allow "opaque" flag to be updated. DO NOT MERGE
Andy McFadden [Thu, 30 Jan 2014 01:17:11 +0000 (17:17 -0800)]
Allow "opaque" flag to be updated. DO NOT MERGE
Moves the "opaque layer" from Layer to Layer::State. This allows
it to be updated as part of a transaction.
Bug
12387406
Change-Id: I0a114ce6adf77cd12fb08f96e0691b76c475768d
Colin Cross [Tue, 18 Feb 2014 21:39:56 +0000 (21:39 +0000)]
am
7a66f7af: am
913a17fd: Merge "libagl: support multilib build"
* commit '
7a66f7afd1b6a975ab3b99b4765781a0d66958c8':
libagl: support multilib build
Colin Cross [Tue, 18 Feb 2014 21:35:25 +0000 (21:35 +0000)]
am
913a17fd: Merge "libagl: support multilib build"
* commit '
913a17fd5f8cabbc73ff46db15b4b53b9aeba7b8':
libagl: support multilib build
Colin Cross [Tue, 18 Feb 2014 21:29:50 +0000 (21:29 +0000)]
Merge "libagl: support multilib build"
Colin Cross [Tue, 18 Feb 2014 20:25:54 +0000 (20:25 +0000)]
am
8a9a2e24: am
d5fe844b: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"
* commit '
8a9a2e24db868fba404049d700ae704b0982e5f3':
Use /(vendor|system)/lib64/egl for 64-bit EGL libraries
Colin Cross [Tue, 18 Feb 2014 20:21:35 +0000 (20:21 +0000)]
am
d5fe844b: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"
* commit '
d5fe844b41778bf87101fc0a0e4e37e779678c50':
Use /(vendor|system)/lib64/egl for 64-bit EGL libraries
Colin Cross [Tue, 18 Feb 2014 20:14:41 +0000 (20:14 +0000)]
Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"
Dan Willemsen [Sun, 16 Feb 2014 18:23:54 +0000 (10:23 -0800)]
Use /(vendor|system)/lib64/egl for 64-bit EGL libraries
Change-Id: Ie64806bfe4ba60a3167b84685cf983d4ada1042d
Arve Hjønnevåg [Sat, 15 Feb 2014 04:14:02 +0000 (20:14 -0800)]
Binder: Disable attemptIncStrongHandle
The driver does not support BC_ATTEMPT_ACQUIRE and will return an error.
IPCThreadState does not handle driver errors, and will resend the failed
command blocking all other commands.
Change-Id: I643986037341821b27b62dc82df933844f4842b8
Arve Hjønnevåg [Fri, 14 Feb 2014 03:22:08 +0000 (19:22 -0800)]
Binder: Make sure binder objects do not overlap
Fixes crashing part of bug
11355082.
The driver still leaks references.
Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071
Colin Cross [Thu, 13 Feb 2014 01:15:53 +0000 (17:15 -0800)]
libagl: support multilib build
Use LOCAL_SRC_FILES_arch and LOCAL_CFLAGS_arch to support building
for multiple architectures.
Change-Id: I829c1bea880739bf8184df4006d0a481ffccc5c2
Dan Stoza [Fri, 14 Feb 2014 23:03:43 +0000 (15:03 -0800)]
Allow disabling layer rotation during screenshots
Add the ability to ignore layers' transformation matrices during
screenshot capture, which will allow the window manager to capture
unrotated images for recents during the device rotation animation.
Bug:
11805195
Change-Id: I854d87bc84ca06ef9a054a454af1c080ee66fbb8
Dianne Hackborn [Fri, 14 Feb 2014 02:00:17 +0000 (02:00 +0000)]
am
b37b312b: am
7d86b454: Merge "frameworks/native: move idmap to frameworks/base"
* commit '
b37b312b829c7ab5107c2f96d0a95a557f67a831':
frameworks/native: move idmap to frameworks/base
Dianne Hackborn [Fri, 14 Feb 2014 01:54:37 +0000 (01:54 +0000)]
am
7d86b454: Merge "frameworks/native: move idmap to frameworks/base"
* commit '
7d86b45472898373bbe3ef03286b66d71ea82b79':
frameworks/native: move idmap to frameworks/base
Dianne Hackborn [Fri, 14 Feb 2014 01:45:27 +0000 (01:45 +0000)]
Merge "frameworks/native: move idmap to frameworks/base"
Nick Kralevich [Thu, 13 Feb 2014 00:16:04 +0000 (00:16 +0000)]
am
0e4d2885: am
2044ac43: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
0e4d2885a34d31f5dbe5a08bdb654953abaf82a2':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Nick Kralevich [Wed, 12 Feb 2014 23:15:07 +0000 (23:15 +0000)]
am
2044ac43: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
2044ac43e53b517526b3c70dc4fbc60ffc01693f':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Nick Kralevich [Wed, 12 Feb 2014 23:09:44 +0000 (23:09 +0000)]
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
Colin Cross [Wed, 12 Feb 2014 02:04:03 +0000 (18:04 -0800)]
frameworks/native: move idmap to frameworks/base
idmap depends on libandroidfw, so it should go in frameworks/base.
Change-Id: Ieee30ba9d8170d3118acc89f0617981228a6974b
Jeff Brown [Wed, 12 Feb 2014 00:35:43 +0000 (00:35 +0000)]
Merge "Add support for injecting events into ActivityContainers."
Jeff Brown [Wed, 12 Feb 2014 00:31:55 +0000 (00:31 +0000)]
am
eac45b8a: (-s ours) am
ed4d28dd: Add method to apply offset to PointerCoords. (DO NOT MERGE)
* commit '
eac45b8a53e8a17b6c9a1e7bb69a8a791073c007':
Add method to apply offset to PointerCoords. (DO NOT MERGE)
Jeff Brown [Wed, 12 Feb 2014 00:26:19 +0000 (00:26 +0000)]
am
ed4d28dd: Add method to apply offset to PointerCoords. (DO NOT MERGE)
* commit '
ed4d28dd70448b13eb74a3166ec8d1c1a530e2d4':
Add method to apply offset to PointerCoords. (DO NOT MERGE)
Jeff Brown [Tue, 11 Feb 2014 22:28:48 +0000 (14:28 -0800)]
Add support for injecting events into ActivityContainers.
Enhanced the input system to support concurrent dispatch of touch
events on multiple displays which is required for this to work.
Add method to apply offset to PointerCoords.
Change-Id: I55fe4a9a8785ae5a2d3341d214fa3c5107f3963a
Jeff Brown [Tue, 11 Feb 2014 22:28:48 +0000 (14:28 -0800)]
Add method to apply offset to PointerCoords. (DO NOT MERGE)
Change-Id: I3dc2ba22b026e5b8e1c3d90f7366ec09a59ce6b6
Dianne Hackborn [Tue, 11 Feb 2014 21:49:02 +0000 (21:49 +0000)]
am
6e5fdb15: am
6c14f0ad: Merge "Runtime resource overlay, iteration 2"
* commit '
6e5fdb1551ca7d117bf7e1acca133a077a8701f0':
Runtime resource overlay, iteration 2
Dianne Hackborn [Tue, 11 Feb 2014 21:41:23 +0000 (21:41 +0000)]
am
6c14f0ad: Merge "Runtime resource overlay, iteration 2"
* commit '
6c14f0ad82be418c742e56fe586657ea0f394b05':
Runtime resource overlay, iteration 2
Dianne Hackborn [Tue, 11 Feb 2014 21:27:35 +0000 (21:27 +0000)]
Merge "Runtime resource overlay, iteration 2"
Dianne Hackborn [Tue, 11 Feb 2014 20:41:09 +0000 (20:41 +0000)]
am
99188064: am
340aa8cb: Merge "New command line tool \'idmap\'"
* commit '
99188064fd3b2d4ca85b02afefa4adb2562f8940':
New command line tool 'idmap'
Dianne Hackborn [Tue, 11 Feb 2014 20:35:42 +0000 (20:35 +0000)]
am
340aa8cb: Merge "New command line tool \'idmap\'"
* commit '
340aa8cbd4afbb68b16f369336cc1c202582f021':
New command line tool 'idmap'
Dianne Hackborn [Tue, 11 Feb 2014 20:29:54 +0000 (20:29 +0000)]
Merge "New command line tool 'idmap'"
Michael Wright [Mon, 10 Feb 2014 23:10:22 +0000 (15:10 -0800)]
Move inputservice over to frameworks/native
Add all of the underlying input system pieces, minux PointerController and
SpriteController, to inputflinger. This is in preparation for moving input to
its own process and the addition of the input HAL.
Try 2.
Change-Id: I5f571fe86eb570885ae994e1f0552fb558930346
Michael Wright [Mon, 10 Feb 2014 23:08:18 +0000 (15:08 -0800)]
Revert "Move inputservice over to frameworks/native"
This reverts commit
2dceb67f1f32bd2ec589c4ac3d83da0b8dbe4a5c.
Michael Wright [Mon, 10 Feb 2014 22:12:49 +0000 (14:12 -0800)]
Move inputservice over to frameworks/native
Add all of the underlying input system pieces, minux PointerController and
SpriteController, to inputflinger. This is in preparation for moving input to
its own process and the addition of the input HAL.
Change-Id: I1419a740b38756bd0d54fef5f5ca337e6815b1b0
Michael Wright [Mon, 10 Feb 2014 21:00:14 +0000 (13:00 -0800)]
Add contains point method to Region
Change-Id: I553433ff7ac39f14ffca8278960d2abc95b4dd63
Stephen Smalley [Fri, 7 Feb 2014 14:16:46 +0000 (09:16 -0500)]
Convert all selinux_android_restorecon and _setfilecon calls to new API.
libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.
Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.
Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Adam Lesinski [Thu, 6 Feb 2014 19:36:37 +0000 (19:36 +0000)]
am
1772970f: am
0f0ccf07: Add new software features
* commit '
1772970fa510b915d7b0006093933278db57f899':
Add new software features
Adam Lesinski [Thu, 6 Feb 2014 19:30:54 +0000 (19:30 +0000)]
am
0f0ccf07: Add new software features
* commit '
0f0ccf07bad594b618f4fcce9a8f79a5bc188bb3':
Add new software features
Colin Cross [Thu, 6 Feb 2014 03:07:47 +0000 (03:07 +0000)]
am
2b957503: am
74be0f7b: Merge "binder: fix all warnings"
* commit '
2b957503b77c938e0698ffa8904e20c38c408d81':
binder: fix all warnings
Colin Cross [Thu, 6 Feb 2014 02:59:37 +0000 (02:59 +0000)]
am
74be0f7b: Merge "binder: fix all warnings"
* commit '
74be0f7be35e7b40a322fa9a407cb49265333a0b':
binder: fix all warnings
Colin Cross [Thu, 6 Feb 2014 02:06:42 +0000 (02:06 +0000)]
Merge "binder: fix all warnings"
Colin Cross [Thu, 6 Feb 2014 01:42:44 +0000 (17:42 -0800)]
binder: fix all warnings
Fix warnings related to casting pointers to ints, using %d or %ld to
print size_t/ssize_t, and unused parameters.
Change-Id: I7a13ba83d402952989c1f795cd9e880a95b98d9e
Patrick Tjin [Wed, 5 Feb 2014 23:06:03 +0000 (15:06 -0800)]
Add uid to sensorservice's dump of active connections
Change-Id: I1c365157bcd28a93635dbde4a8d91c79750e03ae
Adam Lesinski [Wed, 5 Feb 2014 02:03:52 +0000 (18:03 -0800)]
Add new software features
Wearable devices are much more stripped down than
handheld and tablet devices. There are system
services that must not be present on wearable
devices. Those services have their own feature
xml files that get copied to the system image
as needed. They are included by default in the
handheld and tablet core feature files in order
to maintain previous behavior.
Wearable devices should always copy the
data/etc/wearable_core_hardware.xml file and
whatever other files that represent required
services (eg. data/etc/android.software.print.xml).
Change-Id: I410442d45854fe54cba1131ce488a5a459ac580a
Dan Stoza [Wed, 5 Feb 2014 18:55:10 +0000 (18:55 +0000)]
Merge "Fix virtual display nesting"
Andrew Hsieh [Wed, 5 Feb 2014 08:06:22 +0000 (08:06 +0000)]
am
bdab63e0: am
055dac1b: Merge "Fixed apparent copy/paste mistake Bug:
11634373"
* commit '
bdab63e06b6bacb60991420891cb06fe3dc5654f':
Fixed apparent copy/paste mistake Bug:
11634373
Andrew Hsieh [Wed, 5 Feb 2014 07:58:00 +0000 (07:58 +0000)]
am
055dac1b: Merge "Fixed apparent copy/paste mistake Bug:
11634373"
* commit '
055dac1b54af46a0608b32e83fcae45e75a4a8f0':
Fixed apparent copy/paste mistake Bug:
11634373
Andrew Hsieh [Wed, 5 Feb 2014 07:16:30 +0000 (07:16 +0000)]
Merge "Fixed apparent copy/paste mistake Bug:
11634373"
David Friedman [Wed, 5 Feb 2014 03:11:33 +0000 (11:11 +0800)]
Fixed apparent copy/paste mistake
Bug:
11634373
Change-Id: I9b0ac4d3b4a9a2999b2013abd39465a062ec51ea