Igor Murashkin
8be494eb09
am 1738d4fc
: am 462fb3a8
: Merge "gui: Fix return code assert in CpuConsumer_test."
...
* commit '1738d4fca78b7678d09d5c8898e1f80fa63b4a6d':
gui: Fix return code assert in CpuConsumer_test.
2014-03-04 22:35:04 +00:00
Brian Carlstrom
0ae8e39ebc
Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
...
Change-Id: Ic048ed654ea0ae38c9684e5fa5b14742b6b83305
2014-03-04 14:11:55 -08:00
Igor Murashkin
1738d4fca7
am 462fb3a8
: Merge "gui: Fix return code assert in CpuConsumer_test."
...
* commit '462fb3a8d597fffef3d5534544428d5cee9d8c16':
gui: Fix return code assert in CpuConsumer_test.
2014-03-04 21:10:33 +00:00
Igor Murashkin
462fb3a8d5
Merge "gui: Fix return code assert in CpuConsumer_test."
2014-03-04 21:05:41 +00:00
Dan Stoza
4a07dc8d21
Merge "Split BufferQueue into core + producer + consumer"
2014-03-04 20:03:59 +00:00
Mark Salyzyn
d5bb577de0
am eac548c6
: am 61d6a008
: Merge "hwc test: 64-bit compilation error"
...
* commit 'eac548c65c30b04983a8c904f9a1c6003d428196':
hwc test: 64-bit compilation error
2014-03-04 19:22:43 +00:00
Mark Salyzyn
eac548c65c
am 61d6a008
: Merge "hwc test: 64-bit compilation error"
...
* commit '61d6a00895d2e8b9085278d0acbf98c19e7d6ed5':
hwc test: 64-bit compilation error
2014-03-04 19:18:03 +00:00
Mark Salyzyn
61d6a00895
Merge "hwc test: 64-bit compilation error"
2014-03-04 19:10:29 +00:00
Dan Stoza
289ade165e
Split BufferQueue into core + producer + consumer
...
Change-Id: Idc39f1e511d68ce4f02202d35425a419bc0bcd92
2014-03-04 09:33:14 -08:00
Mark Salyzyn
e933c0396f
hwc test: 64-bit compilation error
...
* cast 1u to size_t in max() argument lists
Change-Id: I02f711c89e96e4cfc348f1c7bac455339bec2fa1
2014-03-04 09:11:04 -08:00
Simon Wilson
08d6aa9a90
am 8ffc2346
: am 6e79cb81
: Enable OMAP4 SGX workaround for OMAP3 too
...
* commit '8ffc2346b86ef5a0d686b43229d2bbd70545a208':
Enable OMAP4 SGX workaround for OMAP3 too
2014-03-04 01:00:23 +00:00
Simon Wilson
8ffc2346b8
am 6e79cb81
: Enable OMAP4 SGX workaround for OMAP3 too
...
* commit '6e79cb81d02984c9f7ac0586078f947c94c56c2a':
Enable OMAP4 SGX workaround for OMAP3 too
2014-03-04 00:20:43 +00:00
Michael Wright
962a108856
Parse LED mappings in keylayout files. DO NOT MERGE
...
Change-Id: I2b34939cc0df256e6b872502ea93f2884b4c8334
2014-03-03 13:59:35 -08:00
Igor Murashkin
c0308d7600
Merge "gui: Surface::dequeueBuffer no locker holds mutex while blocking in binder"
2014-03-03 21:11:55 +00:00
Lajos Molnar
c26c0bee1d
Merge "Adding Opus related struct definitions to OMX_Index"
2014-03-03 21:03:34 +00:00
Vignesh Venkatasubramanian
1a8b0ed985
Adding Opus related struct definitions to OMX_Index
...
Adding Opus related structure and constant definitions to
OMX_Index.h
Change-Id: Iae0394c86900f0db322893ffce695f854624833a
2014-03-03 12:01:33 -08:00
Igor Murashkin
0f1889efe7
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
2014-03-03 11:42:27 -08:00
Ying Wang
646e2fbd91
am 0a643374
: am 6b4e5b7f
: Merge "Fix misuse of ."
...
* commit '0a6433749dcd87039f6e31c04ea662b238310b17':
Fix misuse of $(my-dir).
2014-03-01 02:22:55 +00:00
Ying Wang
0a6433749d
am 6b4e5b7f
: Merge "Fix misuse of ."
...
* commit '6b4e5b7f856c32b75e9a22df4c3f2273ae906acb':
Fix misuse of $(my-dir).
2014-03-01 02:15:39 +00:00
Ying Wang
6b4e5b7f85
Merge "Fix misuse of $(my-dir)."
2014-03-01 02:10:27 +00:00
Ying Wang
a3cc7edfce
Fix misuse of $(my-dir).
...
Change-Id: I8b24f60826abe4b541de646cbc3df66929203301
2014-02-28 18:05:56 -08:00
Simon Wilson
6e79cb81d0
Enable OMAP4 SGX workaround for OMAP3 too
...
Change-Id: I04308d8b7435b4adf1811f75f48f9e8a07a8c8a6
2014-02-28 14:30:39 -08:00
Narayan Kamath
87eb08dc07
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
2014-02-28 16:23:59 +00:00
Narayan Kamath
ad0f05bed9
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
2014-02-28 16:19:30 +00:00
Narayan Kamath
b98c4761e0
Merge "Correcting include path in installd test project's Android.mk"
2014-02-28 16:00:55 +00:00
Ramin Zaghi
7400742285
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
2014-02-28 15:41:57 +00:00
Narayan Kamath
622b6b28f2
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
2014-02-28 14:05:52 +00:00
Narayan Kamath
f5684052f2
Merge "API changes for 64 bit platforms."
2014-02-28 13:21:07 +00:00
Xia Wang
6bc1ad7762
Merge "Build the benchmark test to /data/local/tmp/ for automated test"
2014-02-27 19:19:09 +00:00
Narayan Kamath
a90086a914
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
2014-02-27 14:12:55 +00:00
Narayan Kamath
2c95c57b62
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
2014-02-27 13:29:42 +00:00
Narayan Kamath
3e599252c0
am 93e6a48b
: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
...
* commit '93e6a48b3e876708a8161a9946581f5e8ebb382f':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
2014-02-27 13:23:09 +00:00
Narayan Kamath
93e6a48b3e
Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
2014-02-27 13:17:58 +00:00
Jeff Brown
c5e2442e59
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
2014-02-26 18:49:36 -08:00
Xia Wang
b7925f1364
Build the benchmark test to /data/local/tmp/ for automated test
...
Change-Id: I27a5ee24636ff9752a35dbab793821f6b7a79221
2014-02-26 18:04:50 -08:00
Wonsik Kim
e4cf2f20dd
Merge "Implement video plane layer"
2014-02-27 00:09:56 +00:00
Wonsik Kim
f837c93a1b
Implement video plane layer
...
Binding with video source will follow.
Change-Id: Ic14e9757f5b61f4055cbeda47c1bafae0a621abb
2014-02-27 00:08:22 +00:00
Ashok Bhat
d61b48c090
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>
2014-02-26 19:06:27 +00:00
Jesse Hall
a9d27063a1
am 9d65631f
: am c9bf3ba4
: Merge "Virtual Display async mode is overridden"
...
* commit '9d65631f5de153b50331d9f63225fe60ba70f8bc':
Virtual Display async mode is overridden
2014-02-25 21:57:51 +00:00
Jesse Hall
9d65631f5d
am c9bf3ba4
: Merge "Virtual Display async mode is overridden"
...
* commit 'c9bf3ba411c66dd1d977c81f1aca08109cbf8c86':
Virtual Display async mode is overridden
2014-02-25 21:51:10 +00:00
Jesse Hall
c9bf3ba411
Merge "Virtual Display async mode is overridden"
2014-02-25 21:43:09 +00:00
Narayan Kamath
d6b4e78dca
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
2014-02-25 13:17:12 +00:00
Narayan Kamath
ab7b4fe490
am 097b5991
: am e5c99bf3
: Merge "Use long for pointers in opengl/EGL classes"
...
* commit '097b59919f01d7b057d252d23cb96ce5fcdd9469':
Use long for pointers in opengl/EGL classes
2014-02-25 13:17:11 +00:00
Narayan Kamath
aa01ad91cd
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
2014-02-25 13:10:53 +00:00
Narayan Kamath
097b59919f
am e5c99bf3
: Merge "Use long for pointers in opengl/EGL classes"
...
* commit 'e5c99bf38001d86ca41dfc51fac337aa6a6931f4':
Use long for pointers in opengl/EGL classes
2014-02-25 13:10:53 +00:00
Narayan Kamath
aaa27fd5a0
Merge "Use reinterpret_cast when an integer is cast to a pointer"
2014-02-25 13:05:49 +00:00
Narayan Kamath
e5c99bf380
Merge "Use long for pointers in opengl/EGL classes"
2014-02-25 13:05:46 +00:00
Arve Hjønnevåg
580c1c5903
am fe648b4b
: am ead79b83
: Merge "Binder: Make sure binder objects do not overlap"
...
* commit 'fe648b4bf346f837a6ff554ab44fedb203b86966':
Binder: Make sure binder objects do not overlap
2014-02-25 00:14:42 +00:00
Arve Hjønnevåg
fe648b4bf3
am ead79b83
: Merge "Binder: Make sure binder objects do not overlap"
...
* commit 'ead79b8365ea33eb0e21a817d5ca563ee1eb56be':
Binder: Make sure binder objects do not overlap
2014-02-25 00:06:50 +00:00
Arve Hjønnevåg
ead79b8365
Merge "Binder: Make sure binder objects do not overlap"
2014-02-25 00:01:54 +00:00