OSDN Git Service
Anwar Ghuloum [Tue, 11 Mar 2014 23:43:19 +0000 (23:43 +0000)]
am
06ed9491: Merge "Fix parameter ordering for installd\'s dex2oat execl."
* commit '
06ed9491418ce84e4272bf4201545fa6cfe3932e':
Fix parameter ordering for installd's dex2oat execl.
Michael Wright [Tue, 11 Mar 2014 23:22:00 +0000 (23:22 +0000)]
am
9b04f860: Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
* commit '
9b04f860f23481d39c3b45379a324d3630966825':
Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
Anwar Ghuloum [Tue, 11 Mar 2014 23:11:02 +0000 (23:11 +0000)]
Merge "Fix parameter ordering for installd's dex2oat execl."
Anwar Ghuloum [Tue, 11 Mar 2014 22:42:58 +0000 (15:42 -0700)]
Fix parameter ordering for installd's dex2oat execl.
Change-Id: Ibd6fd46c6ec3137874f9a3d5eea134bc804e039a
Michael Wright [Sat, 19 Oct 2013 00:53:50 +0000 (17:53 -0700)]
Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
Change-Id: Ie6dbce926280c748f39e3c54d2ed4accbdcf9e59
Dave Allison [Sat, 8 Mar 2014 01:56:32 +0000 (01:56 +0000)]
am
1649c77e: Merge "ART profiler"
* commit '
1649c77ed29eada5de32ace97033b9d898e9a6eb':
ART profiler
Greg Hackmann [Sat, 8 Mar 2014 01:56:32 +0000 (01:56 +0000)]
am
112aa42e: Merge "SurfaceFlinger: fix 64-bit format string warnings"
* commit '
112aa42e91b4bb0cde334753e2ad05e3f248b377':
SurfaceFlinger: fix 64-bit format string warnings
Jeff Brown [Fri, 7 Mar 2014 23:43:18 +0000 (23:43 +0000)]
am
37bf0789: Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
* commit '
37bf0789f5c1167f6f7f5667b09cad70e0bb27d4':
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
Dave Allison [Fri, 7 Mar 2014 22:25:35 +0000 (22:25 +0000)]
Merge "ART profiler"
Jeff Brown [Fri, 7 Mar 2014 21:57:59 +0000 (13:57 -0800)]
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
Bug:
12938999
Change-Id: I544661b3887332998d703b7b2df9e56c23ab48c4
Greg Hackmann [Fri, 7 Mar 2014 21:47:30 +0000 (21:47 +0000)]
Merge "SurfaceFlinger: fix 64-bit format string warnings"
Greg Hackmann [Fri, 7 Mar 2014 20:44:02 +0000 (12:44 -0800)]
SurfaceFlinger: fix 64-bit format string warnings
Change-Id: Idacfbf0601743fba1c5de7632201a66a307a2710
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Dave Allison [Thu, 30 Jan 2014 22:19:23 +0000 (14:19 -0800)]
ART profiler
Add args to the installd commands for profiler usage.
Make installd create the profile files and allow apps
to write to them.
The profile files are in /data/dalvik-cache/profiles. This
central location is needed due to permissions issues with
dex2oat reading from an app's data directory. The solution
is to put the profile file in a directory owned by the
install user and make the file writeable by the shared group
id of for the app. The app can read and write to these files
only in the profiles directory. The 'system' user also needs
to be able to read the files in order to determine the amount
of change to the file over time.
Bug:
12877748
Change-Id: I9b8e59e3bd7df8a1bf60fa7ffd376a24ba0eb42f
Conflicts:
cmds/installd/commands.c
Aravind Akella [Thu, 6 Mar 2014 22:45:48 +0000 (22:45 +0000)]
am
3a867ddc: am
19d64819: Bug fix for SensorFusion data rate.
* commit '
3a867ddcdc7c65f6b07d2eeeebf6a3e520bd1cf0':
Bug fix for SensorFusion data rate.
Aravind Akella [Thu, 6 Mar 2014 22:16:15 +0000 (22:16 +0000)]
am
19d64819: Bug fix for SensorFusion data rate.
* commit '
19d648195673b106152610e3787c95886946460f':
Bug fix for SensorFusion data rate.
Aravind Akella [Fri, 6 Dec 2013 00:24:59 +0000 (16:24 -0800)]
Bug fix for SensorFusion data rate.
SensorFusion is always returning data at the slowest possible sampling rate (5 Hz). batch() is getting called twice, first time with the requested rate and second time with the slowest rate (which overwrites the requested rate). Fix batch call in SensorFusion::activate()
Bug:
12064319
Change-Id: If62f3e514233f69810336fd22b136b4395b667d3
(cherry picked from commit
88509090387eeb400771a786171866710cca230c)
Aravind Akella [Thu, 6 Mar 2014 02:35:17 +0000 (02:35 +0000)]
am
8ae7c02e: am
ffac23b2: am
4b84704b: Ignore flush complete events when recording last value for a sensor.
* commit '
8ae7c02e6ffb5533958d04ac0d8f4a8d77fdb734':
Ignore flush complete events when recording last value for a sensor.
Aravind Akella [Thu, 6 Mar 2014 02:24:29 +0000 (02:24 +0000)]
am
ffac23b2: am
4b84704b: Ignore flush complete events when recording last value for a sensor.
* commit '
ffac23b210a96e769fd79ae912b44a185e7d69bd':
Ignore flush complete events when recording last value for a sensor.
Aravind Akella [Thu, 6 Mar 2014 02:18:29 +0000 (02:18 +0000)]
am
4b84704b: Ignore flush complete events when recording last value for a sensor.
* commit '
4b84704b97300eff3ebfab85652e64d54149d205':
Ignore flush complete events when recording last value for a sensor.
Mathieu Chartier [Thu, 6 Mar 2014 01:05:22 +0000 (01:05 +0000)]
am
3c39e03c: Merge "Don\'t pass in empty arg to dex2oat."
* commit '
3c39e03c08094ce65608cae8a45dd726cf10b5c3':
Don't pass in empty arg to dex2oat.
Mathieu Chartier [Thu, 6 Mar 2014 01:01:08 +0000 (01:01 +0000)]
Merge "Don't pass in empty arg to dex2oat."
Mathieu Chartier [Thu, 6 Mar 2014 00:58:03 +0000 (16:58 -0800)]
Don't pass in empty arg to dex2oat.
We would occassionally pass in an empty arg "" instead of a NULL.
This caused problems since dex2oat isn't made to handle empty args.
Change-Id: Ibb1aed64a4aa17459b2a75a5a2abcf13c7fa8ac7
Aravind Akella [Tue, 4 Mar 2014 03:02:46 +0000 (19:02 -0800)]
Ignore flush complete events when recording last value for a sensor.
Bug:
11822806
Change-Id: I1402d6684ed71ed413aef6a7be3aad945b331ec2
Brian Carlstrom [Wed, 5 Mar 2014 20:09:46 +0000 (20:09 +0000)]
am
e19c99aa: Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"
* commit '
e19c99aad605c395f53bf39ae1a27e298e7e33ce':
Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
Brian Carlstrom [Wed, 5 Mar 2014 20:02:00 +0000 (20:02 +0000)]
Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"
Michael Wright [Wed, 5 Mar 2014 00:54:24 +0000 (00:54 +0000)]
am
1298c7e5: Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev
* commit '
1298c7e527fd242a39f9c0d53aa4f35d1c9decab':
Parse LED mappings in keylayout files. DO NOT MERGE
Michael Wright [Wed, 5 Mar 2014 00:51:43 +0000 (00:51 +0000)]
Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev
Brian Carlstrom [Tue, 11 Feb 2014 00:42:52 +0000 (16:42 -0800)]
Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
Change-Id: Ic048ed654ea0ae38c9684e5fa5b14742b6b83305
Igor Murashkin [Tue, 4 Mar 2014 21:10:33 +0000 (21:10 +0000)]
am
462fb3a8: Merge "gui: Fix return code assert in CpuConsumer_test."
* commit '
462fb3a8d597fffef3d5534544428d5cee9d8c16':
gui: Fix return code assert in CpuConsumer_test.
Igor Murashkin [Tue, 4 Mar 2014 21:05:40 +0000 (21:05 +0000)]
Merge "gui: Fix return code assert in CpuConsumer_test."
Mark Salyzyn [Tue, 4 Mar 2014 19:18:03 +0000 (19:18 +0000)]
am
61d6a008: Merge "hwc test: 64-bit compilation error"
* commit '
61d6a00895d2e8b9085278d0acbf98c19e7d6ed5':
hwc test: 64-bit compilation error
Mark Salyzyn [Tue, 4 Mar 2014 19:10:28 +0000 (19:10 +0000)]
Merge "hwc test: 64-bit compilation error"
Mark Salyzyn [Tue, 4 Mar 2014 17:11:04 +0000 (09:11 -0800)]
hwc test: 64-bit compilation error
* cast 1u to size_t in max() argument lists
Change-Id: I02f711c89e96e4cfc348f1c7bac455339bec2fa1
Simon Wilson [Tue, 4 Mar 2014 00:20:43 +0000 (00:20 +0000)]
am
6e79cb81: Enable OMAP4 SGX workaround for OMAP3 too
* commit '
6e79cb81d02984c9f7ac0586078f947c94c56c2a':
Enable OMAP4 SGX workaround for OMAP3 too
Michael Wright [Fri, 18 Oct 2013 00:35:53 +0000 (17:35 -0700)]
Parse LED mappings in keylayout files. DO NOT MERGE
Change-Id: I2b34939cc0df256e6b872502ea93f2884b4c8334
Ying Wang [Sat, 1 Mar 2014 02:15:39 +0000 (02:15 +0000)]
am
6b4e5b7f: Merge "Fix misuse of ."
* commit '
6b4e5b7f856c32b75e9a22df4c3f2273ae906acb':
Fix misuse of $(my-dir).
Ying Wang [Sat, 1 Mar 2014 02:10:27 +0000 (02:10 +0000)]
Merge "Fix misuse of $(my-dir)."
Ying Wang [Sat, 1 Mar 2014 02:05:56 +0000 (18:05 -0800)]
Fix misuse of $(my-dir).
Change-Id: I8b24f60826abe4b541de646cbc3df66929203301
Simon Wilson [Fri, 28 Feb 2014 22:30:39 +0000 (14:30 -0800)]
Enable OMAP4 SGX workaround for OMAP3 too
Change-Id: I04308d8b7435b4adf1811f75f48f9e8a07a8c8a6
Narayan Kamath [Fri, 28 Feb 2014 16:19:30 +0000 (16:19 +0000)]
am
b98c4761: Merge "Correcting include path in installd test project\'s Android.mk"
* commit '
b98c4761e0c80a8d8138910e0a5e5fc8baff8282':
Correcting include path in installd test project's Android.mk
Narayan Kamath [Fri, 28 Feb 2014 16:00:54 +0000 (16:00 +0000)]
Merge "Correcting include path in installd test project's Android.mk"
Ramin Zaghi [Thu, 27 Feb 2014 15:20:40 +0000 (15:20 +0000)]
Correcting include path in installd test project's Android.mk
installd project has moved from frameworks/base to frameworks/native
and so its test project's c_include path defined in Android.mk
has to match the change.
Change-Id: I597125ff659f51edbd9fc95371790e2d567c78be
Narayan Kamath [Thu, 27 Feb 2014 13:23:09 +0000 (13:23 +0000)]
am
93e6a48b: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit '
93e6a48b3e876708a8161a9946581f5e8ebb382f':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
Narayan Kamath [Thu, 27 Feb 2014 13:17:57 +0000 (13:17 +0000)]
Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
Ashok Bhat [Wed, 26 Feb 2014 09:56:09 +0000 (09:56 +0000)]
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
This will allow eglGetDisplay(int) to work on both 32-bit
and 64-bit systems when EGL_DEFAULT_DISPLAY is passed as
a parameter.
Change-Id: I0d7e9ca5410b0dd893eacc02aac40956908e4f25
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
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: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: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: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: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 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
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 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
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 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
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 [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: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: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
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 [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: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 method to apply offset to PointerCoords. (DO NOT MERGE)
Change-Id: I3dc2ba22b026e5b8e1c3d90f7366ec09a59ce6b6
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: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'"
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>