Marco Nelissen
ce9f107c9d
am 793be12c
: am b730a452
: am f0190bff
: Add support for writing byte arrays to parcels
...
* commit '793be12c0f5a7878d1085e94e58a9c36c84f0911':
Add support for writing byte arrays to parcels
2014-03-15 00:30:46 +00:00
Marco Nelissen
793be12c0f
am b730a452
: am f0190bff
: Add support for writing byte arrays to parcels
...
* commit 'b730a45216991cf22c39451c47393b4bccae111b':
Add support for writing byte arrays to parcels
2014-03-14 23:33:08 +00:00
Marco Nelissen
446ef4bae2
am f0190bff
: Add support for writing byte arrays to parcels
...
* commit 'f0190bff38b6c29abbfc4a877442f71fc3d7dad8':
Add support for writing byte arrays to parcels
2014-03-14 23:32:45 +00:00
Marco Nelissen
b730a45216
am f0190bff
: Add support for writing byte arrays to parcels
...
* commit 'f0190bff38b6c29abbfc4a877442f71fc3d7dad8':
Add support for writing byte arrays to parcels
2014-03-14 22:55:54 +00:00
Mark Salyzyn
c45011f272
am cdbf28b3
: Merge "native frameworks: 64-bit compile issues"
...
* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba':
native frameworks: 64-bit compile issues
2014-03-13 23:18:43 +00:00
Mark Salyzyn
993146092f
am d4dabf87
: am cdbf28b3
: Merge "native frameworks: 64-bit compile issues"
...
* commit 'd4dabf872ac0a12e12aebae9032f7d62762c2aeb':
native frameworks: 64-bit compile issues
2014-03-13 23:12:09 +00:00
Jesse Hall
49bfda1fbd
Fix broken build for more tests
...
Change-Id: I7bdd12a833233724805d01d993541ee05caa9bf6
2014-03-13 15:09:17 -07:00
Jesse Hall
85c0fee024
Fix broken test build
...
Change-Id: I767bcefd92899334e4769dd3495595f546133694
2014-03-13 14:34:28 -07:00
Marco Nelissen
f0190bff38
Add support for writing byte arrays to parcels
...
b/13418320
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
2014-03-13 14:17:40 -07:00
Jesse Hall
73ed82f809
Merge "Add sideband streams to BufferQueue and related classes"
2014-03-13 20:28:17 +00:00
Dan Stoza
6d5a7bb970
Remove deprecated BufferQueue constructor
...
Bug: 13415624
Change-Id: I52f58a4d22296d9fc3cdbd4ad53eb10a785db3ce
2014-03-13 11:39:09 -07:00
Dan Stoza
6780a2d6a5
Remove deprecated BufferQueue constructor
...
Bug: 13415624
Change-Id: I1c17833511b5961af5a9bbb9cc3d627ce558d424
2014-03-13 11:31:43 -07:00
Dan Stoza
fe50d2a0a1
BufferItemConsumer: Use IGBC instead of BQ
...
Change-Id: Id1756ac62954ba412f2c23c5fa6e5d760c299347
2014-03-13 11:12:04 -07:00
Mark Salyzyn
d4dabf872a
am cdbf28b3
: Merge "native frameworks: 64-bit compile issues"
...
* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba':
native frameworks: 64-bit compile issues
2014-03-13 15:26:10 +00:00
Mark Salyzyn
cdbf28b3f7
Merge "native frameworks: 64-bit compile issues"
2014-03-13 15:20:45 +00:00
Anwar Ghuloum
f4b08ebc61
am 06ed9491
: Merge "Fix parameter ordering for installd\'s dex2oat execl."
...
* commit '06ed9491418ce84e4272bf4201545fa6cfe3932e':
Fix parameter ordering for installd's dex2oat execl.
2014-03-13 03:43:10 +00:00
RoboErik
a3f519fe6f
am ffd353a7
: (-s ours) am d9e113f0
: b/12068020 add nonce to InputDeviceDescriptor. Do not merge
...
* commit 'ffd353a73eb7794ef556c4e646f866b580a03abb':
b/12068020 add nonce to InputDeviceDescriptor. Do not merge
2014-03-12 23:04:49 +00:00
Michael Wright
0c28f11e22
Merge "Controllers must have buttons and a movement mechanism."
2014-03-12 21:56:24 +00:00
RoboErik
ffd353a73e
am d9e113f0
: b/12068020 add nonce to InputDeviceDescriptor. Do not merge
...
* commit 'd9e113f0e0feac1a801f8339d2f907302bd432c5':
b/12068020 add nonce to InputDeviceDescriptor. Do not merge
2014-03-12 21:12:28 +00:00
Mark Salyzyn
92dc3fc52c
native frameworks: 64-bit compile issues
...
- Fix format (print/scanf)
- Suppress unused argument warning messages (bonus)
Change-Id: I05c7724d2aba6da1e82a86000e11f3a8fef4e728
2014-03-12 13:12:44 -07:00
Anwar Ghuloum
d105876a6c
am 85864b87
: am 06ed9491
: Merge "Fix parameter ordering for installd\'s dex2oat execl."
...
* commit '85864b8724b3908d2f5aa861276ce5e80d7f820e':
Fix parameter ordering for installd's dex2oat execl.
2014-03-12 19:57:05 +00:00
Michael Wright
4059bb574a
am d0f7ce45
: (-s ours) am 9b04f860
: Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
...
* commit 'd0f7ce457c59d5f50b0fefc0fe768fad564d0c7e':
Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
2014-03-12 19:56:40 +00:00
RoboErik
d9e113f0e0
b/12068020 add nonce to InputDeviceDescriptor. Do not merge
...
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/401795/
Adds a nonce field to allow generation of unique descriptors for
input devices.
Change-Id: Ie82bfb728bea95792b3b138dd3974f8b0aff63e0
2014-03-12 12:51:54 -07:00
Michael Wright
42f2c6a92c
Controllers must have buttons and a movement mechanism.
...
Some devices have joystick axes or DPad keys, but no gamepad buttons (or vice
versa). We shouldn't count these as gamepads since games can't really be
expected to work with this setup in the general case. Instead, require that a
device has a movement mechanism (joystick axes or DPad buttons), as well as at
least one gamepad button before considering it a controller.
Bug: 13432364
Change-Id: I64372e69d29c775094e2b1faa89714da8c29e2be
2014-03-12 12:18:01 -07:00
Dan Stoza
685c0ae8de
Merge "BufferQueue: Allow returning interfaces as I*/Bn*"
2014-03-12 19:14:53 +00:00
Dan Stoza
f522af7eb6
BufferQueue: Allow returning interfaces as I*/Bn*
...
This adds a second createBufferQueue method that returns
sp<IGraphicBuffer*> interfaces instead of sp<BnGraphicBuffer*>, since
most clients don't actually need the Binderized versions (but some
might).
Change-Id: Iaf4f719c96ddb6f704afc75cf52be22588173e32
2014-03-12 10:17:20 -07:00
Andy McFadden
047b81ce05
Merge "Adjust for device orientation"
2014-03-12 16:56:12 +00:00
Andy McFadden
709d7dec79
Adjust for device orientation
...
When the device is rotated, reverse the width/height values.
Change-Id: Idc2b80b1cb96d9379cd94192997580e1ade70bf6
2014-03-12 09:50:15 -07:00
Dan Stoza
88a459a9b3
VirtualDisplaySurface: no attach/detach support
...
Change-Id: I630dd6e352940318c33a4e072d2f33a6ec58c556
2014-03-12 09:34:36 -07:00
Dan Stoza
c9ed7d3768
Merge "BufferQueue: Allow detaching/reattaching buffers"
2014-03-11 23:47:15 +00:00
Anwar Ghuloum
85864b8724
am 06ed9491
: Merge "Fix parameter ordering for installd\'s dex2oat execl."
...
* commit '06ed9491418ce84e4272bf4201545fa6cfe3932e':
Fix parameter ordering for installd's dex2oat execl.
2014-03-11 23:43:19 +00:00
Michael Wright
d0f7ce457c
am 9b04f860
: Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
...
* commit '9b04f860f23481d39c3b45379a324d3630966825':
Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
2014-03-11 23:22:00 +00:00
Anwar Ghuloum
06ed949141
Merge "Fix parameter ordering for installd's dex2oat execl."
2014-03-11 23:11:02 +00:00
Anwar Ghuloum
4bc054019d
Fix parameter ordering for installd's dex2oat execl.
...
Change-Id: Ibd6fd46c6ec3137874f9a3d5eea134bc804e039a
2014-03-11 15:42:58 -07:00
Michael Wright
9b04f860f2
Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
...
Change-Id: Ie6dbce926280c748f39e3c54d2ed4accbdcf9e59
2014-03-11 14:19:33 -07:00
Jesse Hall
399184a4cd
Add sideband streams to BufferQueue and related classes
...
Sideband streams are essentially a device-specific buffer queue that
bypasses the BufferQueue system. They can be used for situations with
hard real-time requirements like high-quality TV and video playback
with A/V sync. A handle to the stream is provided by the source HAL,
and attached to a BufferQueue. The sink HAL can read buffers via the
stream handle rather than acquiring individual buffers from the
BufferQueue.
Change-Id: Ib3f262eddfc520f4bbe3d9b91753ed7dd09d3a9b
2014-03-11 12:23:14 -07:00
Dave Allison
7ccff3f7f2
am 1649c77e
: Merge "ART profiler"
...
* commit '1649c77ed29eada5de32ace97033b9d898e9a6eb':
ART profiler
2014-03-11 18:51:44 +00:00
Greg Hackmann
645427aeac
am 112aa42e
: Merge "SurfaceFlinger: fix 64-bit format string warnings"
...
* commit '112aa42e91b4bb0cde334753e2ad05e3f248b377':
SurfaceFlinger: fix 64-bit format string warnings
2014-03-11 18:51:43 +00:00
Mathieu Chartier
b80b1f8445
am 3c39e03c
: Merge "Don\'t pass in empty arg to dex2oat."
...
* commit '3c39e03c08094ce65608cae8a45dd726cf10b5c3':
Don't pass in empty arg to dex2oat.
2014-03-11 18:30:06 +00:00
Brian Carlstrom
672d967438
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
2014-03-11 18:29:53 +00:00
Igor Murashkin
a9a80939a7
am 462fb3a8
: Merge "gui: Fix return code assert in CpuConsumer_test."
...
* commit '462fb3a8d597fffef3d5534544428d5cee9d8c16':
gui: Fix return code assert in CpuConsumer_test.
2014-03-11 18:29:24 +00:00
Mark Salyzyn
11b8885445
am 61d6a008
: Merge "hwc test: 64-bit compilation error"
...
* commit '61d6a00895d2e8b9085278d0acbf98c19e7d6ed5':
hwc test: 64-bit compilation error
2014-03-11 18:29:15 +00:00
Andy McFadden
e98151e004
Remove "screenshot"
...
This is the old screenshot utility, which relies on direct access
to the framebuffer device. It was replaced a long time ago by
"screencap", which talks to SurfaceFlinger (and includes a fallback
that tries to use the FB dev).
Change-Id: Id75a574bc78033761070b64d528fed06e23a0189
2014-03-11 11:21:21 -07:00
Ying Wang
b1078ae88d
am 6b4e5b7f
: Merge "Fix misuse of ."
...
* commit '6b4e5b7f856c32b75e9a22df4c3f2273ae906acb':
Fix misuse of $(my-dir).
2014-03-11 18:17:36 +00:00
Narayan Kamath
3995b20170
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-03-11 18:17:00 +00:00
Narayan Kamath
cd29bbef6d
am 93e6a48b
: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
...
* commit '93e6a48b3e876708a8161a9946581f5e8ebb382f':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
2014-03-11 18:16:18 +00:00
Jesse Hall
7bc5aa8905
am c9bf3ba4
: Merge "Virtual Display async mode is overridden"
...
* commit 'c9bf3ba411c66dd1d977c81f1aca08109cbf8c86':
Virtual Display async mode is overridden
2014-03-11 17:12:15 +00:00
Narayan Kamath
8cf113a3e5
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-03-11 00:53:05 +00:00
Narayan Kamath
6622f3abc1
am e5c99bf3
: Merge "Use long for pointers in opengl/EGL classes"
...
* commit 'e5c99bf38001d86ca41dfc51fac337aa6a6931f4':
Use long for pointers in opengl/EGL classes
2014-03-11 00:53:05 +00:00
Arve Hjønnevåg
04966baf69
am ead79b83
: (-s ours) Merge "Binder: Make sure binder objects do not overlap"
...
* commit 'ead79b8365ea33eb0e21a817d5ca563ee1eb56be':
Binder: Make sure binder objects do not overlap
2014-03-11 00:52:51 +00:00