OSDN Git Service
Andy McFadden [Wed, 5 Mar 2014 23:06:53 +0000 (15:06 -0800)]
Restore old OpenGL tests
These tests call android_createDisplaySurface() to get a
FramebufferNativeWindow that is passed to EGL. This relies on the
existence of the framebuffer HAL, which is not supported on many
recent devices.
This change adds a new "window surface" object that the tests
can use to get a window from SurfaceFlinger instead. All tests
except for the HWC tests now appear to do things.
The HWC tests don't do anything useful, but they no longer depend
on the android_createDisplaySurface() function.
Bug
13323813
Change-Id: I2cbfbacb3452fb658c29e945b0c7ae7c94c1a4ba
Andy McFadden [Thu, 6 Mar 2014 15:31:39 +0000 (15:31 +0000)]
Merge "FramebufferNativeWindow.h is obsolete"
Aravind Akella [Thu, 6 Mar 2014 02:57:23 +0000 (02:57 +0000)]
am
e7643e43: am
8ae7c02e: am
ffac23b2: am
4b84704b: Ignore flush complete events when recording last value for a sensor.
* commit '
e7643e431abc2d1b42ab1d68913ec22d0b180554':
Ignore flush complete events when recording last value for a sensor.
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.
Mathieu Chartier [Thu, 6 Mar 2014 02:29:17 +0000 (02:29 +0000)]
am
1d84e256: am
3c39e03c: Merge "Don\'t pass in empty arg to dex2oat."
* commit '
1d84e25648efcda02e53910530f59a3c3351f152':
Don't pass in empty arg to dex2oat.
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 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.
(cherry picked from commit
f53dbfeda39c290ed67b0682d559a80cb42ceb79)
Change-Id: Ia2d60b895391bf83b5d250c20ddb8a4917d347a6
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
Andy McFadden [Wed, 5 Mar 2014 23:40:26 +0000 (15:40 -0800)]
FramebufferNativeWindow.h is obsolete
This adds a deprecation #warning to the header.
Change-Id: Ia32f16e491cb01d435ec8846dda3d9a7d1a9cfc5
Brian Carlstrom [Wed, 5 Mar 2014 22:33:26 +0000 (22:33 +0000)]
am
c9e60374: am
e19c99aa: Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"
* commit '
c9e60374f5144e94103e5b866570be114aa165c8':
Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
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"
Dan Stoza [Wed, 5 Mar 2014 18:55:13 +0000 (18:55 +0000)]
Merge "Change BufferQueue into producer/consumer wrapper"
Michael Wright [Wed, 5 Mar 2014 01:00:51 +0000 (01:00 +0000)]
am
f8da9623: (-s ours) am
1298c7e5: Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev
* commit '
f8da9623f3f565d0be9ade3d3439c45aa23dd229':
Parse LED mappings in keylayout files. DO NOT MERGE
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
Dan Stoza [Mon, 3 Mar 2014 18:16:19 +0000 (10:16 -0800)]
Change BufferQueue into producer/consumer wrapper
Now that BufferQueue has been split into core + producer + consumer,
rewrite BufferQueue to be a thin layer over a producer and consumer
interface. Eventually, this layer will be deprecated in favor of
only using either the producer or consumer interface, as applicable.
Change-Id: I340ae5f5b633b244fb594615ff52ba50b9e2f7e4
Igor Murashkin [Tue, 4 Mar 2014 22:35:04 +0000 (22:35 +0000)]
am
1738d4fc: am
462fb3a8: Merge "gui: Fix return code assert in CpuConsumer_test."
* commit '
1738d4fca78b7678d09d5c8898e1f80fa63b4a6d':
gui: Fix return code assert in CpuConsumer_test.
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."
Dan Stoza [Tue, 4 Mar 2014 20:03:59 +0000 (20:03 +0000)]
Merge "Split BufferQueue into core + producer + consumer"
Mark Salyzyn [Tue, 4 Mar 2014 19:22:43 +0000 (19:22 +0000)]
am
eac548c6: am
61d6a008: Merge "hwc test: 64-bit compilation error"
* commit '
eac548c65c30b04983a8c904f9a1c6003d428196':
hwc test: 64-bit compilation error
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"
Dan Stoza [Fri, 28 Feb 2014 19:17:17 +0000 (11:17 -0800)]
Split BufferQueue into core + producer + consumer
Change-Id: Idc39f1e511d68ce4f02202d35425a419bc0bcd92
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 01:00:23 +0000 (01:00 +0000)]
am
8ffc2346: am
6e79cb81: Enable OMAP4 SGX workaround for OMAP3 too
* commit '
8ffc2346b86ef5a0d686b43229d2bbd70545a208':
Enable OMAP4 SGX workaround for OMAP3 too
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
Igor Murashkin [Mon, 3 Mar 2014 21:11:54 +0000 (21:11 +0000)]
Merge "gui: Surface::dequeueBuffer no locker holds mutex while blocking in binder"
Lajos Molnar [Mon, 3 Mar 2014 21:03:33 +0000 (21:03 +0000)]
Merge "Adding Opus related struct definitions to OMX_Index"
Vignesh Venkatasubramanian [Mon, 3 Feb 2014 22:21:31 +0000 (14:21 -0800)]
Adding Opus related struct definitions to OMX_Index
Adding Opus related structure and constant definitions to
OMX_Index.h
Change-Id: Iae0394c86900f0db322893ffce695f854624833a
Igor Murashkin [Sat, 1 Mar 2014 02:44:21 +0000 (18:44 -0800)]
gui: Surface::dequeueBuffer no locker holds mutex while blocking in binder
- This also fixes a hang in the camera service when trying to shut down
if the producer is infinitely blocked while trying to get a new buffer.
Bug:
13250382
Change-Id: I32ca82162bb8645b97dbe084e13e05ca05529a42
Ying Wang [Sat, 1 Mar 2014 02:22:55 +0000 (02:22 +0000)]
am
0a643374: am
6b4e5b7f: Merge "Fix misuse of ."
* commit '
0a6433749dcd87039f6e31c04ea662b238310b17':
Fix misuse of $(my-dir).
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:23:59 +0000 (16:23 +0000)]
am
ad0f05be: am
b98c4761: Merge "Correcting include path in installd test project\'s Android.mk"
* commit '
ad0f05bed95dc816a5b1e4bea23b0736458c1857':
Correcting include path in installd test project's Android.mk
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 [Fri, 28 Feb 2014 14:05:21 +0000 (14:05 +0000)]
Fix bad link tag in javadoc.
Java7 javadoc tools seem to accept this without complaint
but not all targets use java7 yet.
Change-Id: Ib08be8ad0f7db2e89f38b764cce858d0e7eecd2e
Narayan Kamath [Fri, 28 Feb 2014 13:21:06 +0000 (13:21 +0000)]
Merge "API changes for 64 bit platforms."
Xia Wang [Thu, 27 Feb 2014 19:19:08 +0000 (19:19 +0000)]
Merge "Build the benchmark test to /data/local/tmp/ for automated test"
Narayan Kamath [Thu, 27 Feb 2014 14:12:55 +0000 (14:12 +0000)]
API changes for 64 bit platforms.
EGLObjectHandle.<init>(int) and int EGLObjectHandle.getHandle()
have now been deprecated and replaced with variants that take
and return java longs.
bug:
13181704
Change-Id: Ie88e591c288d6de5655364b4cd673f61cce68d7d
Narayan Kamath [Thu, 27 Feb 2014 13:29:42 +0000 (13:29 +0000)]
am
3e599252: am
93e6a48b: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit '
3e599252c0f5a8e70f4b8d4ab5baffb7e5b0b0e1':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
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"
Jeff Brown [Thu, 27 Feb 2014 02:48:51 +0000 (18:48 -0800)]
Add touch.wake IDC property to control wakeup.
Normally we do not wake the device when the internal touch screen is
touched. This behavior can now be configured by setting a property
in the input device configuration file. Add the following line to
the IDC file to enable an initial touch to wake the device from sleep.
touch.wake = 1
Change-Id: Ifd6d4f51afacd30d85f475725a66e6fcccde9cbb
Xia Wang [Thu, 27 Feb 2014 02:04:50 +0000 (18:04 -0800)]
Build the benchmark test to /data/local/tmp/ for automated test
Change-Id: I27a5ee24636ff9752a35dbab793821f6b7a79221
Wonsik Kim [Thu, 27 Feb 2014 00:09:56 +0000 (00:09 +0000)]
Merge "Implement video plane layer"
Wonsik Kim [Mon, 24 Feb 2014 05:20:35 +0000 (14:20 +0900)]
Implement video plane layer
Binding with video source will follow.
Change-Id: Ic14e9757f5b61f4055cbeda47c1bafae0a621abb
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: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