Elliott Hughes
b7f3742feb
am d9be16f9
: Merge "Fix OpenGL stub exception handling."
...
* commit 'd9be16f920f7c2581fda3ca495c1e6fc88857a6c':
Fix OpenGL stub exception handling.
2013-09-27 15:38:04 -07:00
Elliott Hughes
d9be16f920
Merge "Fix OpenGL stub exception handling."
2013-09-27 22:31:19 +00:00
Mathias Agopian
8499e93f4d
fix crashers with wifi/virtual displays
...
Bug: 10647742
Change-Id: I4b8ed9da52ef95af3a3b3a04b98514a3776a674d
2013-09-27 11:30:59 -07:00
Mathias Agopian
338acd6869
am 86206b41
: Merge "fix initialization of framebuffer target crop rect on hwc 1.3" into klp-dev
...
* commit '86206b41b2ff000e086301c6bafb8da577e563b2':
fix initialization of framebuffer target crop rect on hwc 1.3
2013-09-26 12:44:27 -07:00
Mathias Agopian
0ff4b28396
am 6da15f46
: fix crashers with wifi/virtual displays
...
* commit '6da15f46f5f8b38e31384d641f8d3db2c3c6ea30':
fix crashers with wifi/virtual displays
2013-09-26 12:44:27 -07:00
Mathias Agopian
86206b41b2
Merge "fix initialization of framebuffer target crop rect on hwc 1.3" into klp-dev
2013-09-26 19:41:22 +00:00
Mathias Agopian
8f63c2049b
fix initialization of framebuffer target crop rect on hwc 1.3
...
Bug: 10936771
Change-Id: If283e5e231ca34b93e0b1784bb4e8e4c7bfd75de
2013-09-25 20:44:34 -07:00
Mathias Agopian
6da15f46f5
fix crashers with wifi/virtual displays
...
Bug: 10647742
Change-Id: I4b8ed9da52ef95af3a3b3a04b98514a3776a674d
2013-09-25 20:40:07 -07:00
Elliott Hughes
2adde7c837
Fix OpenGL stub exception handling.
...
Bug: https://code.google.com/p/android/issues/detail?id=60390
Change-Id: I2bdc22c5fe75f5e41ffb9dd9259ae92cf8a12917
2013-09-24 17:18:05 -07:00
The Android Automerger
dbf6e66206
merge in klp-release history after reset to klp-dev
2013-09-22 10:51:13 -07:00
Nick Kralevich
e4e91c4ead
resolved conflicts for merge of e678897f
to klp-dev-plus-aosp
...
Change-Id: Ie2a5e7a917ab7f5a0ee98300b880d22c7a10bf70
2013-09-20 12:45:20 -07:00
Nick Kralevich
e678897f3a
Merge "Proper security labeling of multi-user data directories."
2013-09-20 19:35:36 +00:00
Eino-Ville Talvala
a7395b4078
GLConsumer: Add query for current frame number.
...
Surface the underlying frame number of the current texture.
Bug: 10830400
Change-Id: Ide3a7da12ea0aac54588beb6bf00dbfe2cd37653
2013-09-20 03:37:01 -07:00
Mathias Agopian
754bad4534
am d555684c
: reinstate black-screenshot debugging code
...
* commit 'd555684cb36dfb959694db76962e570184f98838':
reinstate black-screenshot debugging code
2013-09-19 17:13:52 -07:00
Mathias Agopian
d555684cb3
reinstate black-screenshot debugging code
...
turned off by default.
Bug: 10809349
Change-Id: I3e6b8c7860e6b0e122b8f07de4020967cd1f005c
2013-09-19 17:09:26 -07:00
Mathias Agopian
f589dd2915
am e2a3e872
: Merge "Fix GLES context version selection" into klp-dev
...
* commit 'e2a3e8727408937bb7107c206444fa49a150f358':
Fix GLES context version selection
2013-09-19 15:34:15 -07:00
Mathias Agopian
e2a3e87274
Merge "Fix GLES context version selection" into klp-dev
2013-09-19 22:29:30 +00:00
Eino-Ville Talvala
1160e89d31
am d171da97
: GLConsumer: Add query for current frame number.
...
* commit 'd171da973de3c6b30263011334fdcd916739144f':
GLConsumer: Add query for current frame number.
2013-09-19 14:59:51 -07:00
Eino-Ville Talvala
d171da973d
GLConsumer: Add query for current frame number.
...
Surface the underlying frame number of the current texture.
Bug: 10830400
Change-Id: Ide3a7da12ea0aac54588beb6bf00dbfe2cd37653
2013-09-19 13:36:07 -07:00
The Android Automerger
7fa91dc3a7
merge in klp-release history after reset to klp-dev
2013-09-19 06:01:50 -07:00
Mathias Agopian
2185f8b420
Fix GLES context version selection
...
Explicitly selects an ES 2.0 config first, then an ES 1.x config,
before attempting the fallback path for the emulator.
Bug: 10820214
Change-Id: Ia8cc084c02a0e3de910def024da8a08d02bbd89d
2013-09-18 16:20:26 -07:00
Mathias Agopian
a7e1660b25
am c1c05de4
: fix camera API 2.0 orientation
...
* commit 'c1c05de415854eb7a13a16b7e22a22de8515123a':
fix camera API 2.0 orientation
2013-09-18 15:33:38 -07:00
Robert Craig
880d1a957e
Proper security labeling of multi-user data directories.
...
Add seinfo paramater to appropriate make directory
functions. This allows proper labeling for multi-user
scenarios.
Change-Id: Iaba7c40645bc7b6cc823d613da0c3782acf6ddd5
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-09-18 13:21:12 +00:00
Mathias Agopian
c1c05de415
fix camera API 2.0 orientation
...
we add a flag to ANativeWindow::setBufferTransform that means
"apply the inverse rotation of the display this buffer is displayed
onto to".
Bug: 10804238
Change-Id: Id2447676271950463e8dbcef1b95935c5c3f32b2
2013-09-17 23:45:22 -07:00
The Android Automerger
3134a0bb18
merge in klp-release history after reset to klp-dev
2013-09-17 21:11:23 -07:00
The Android Automerger
2f1bd0a9e2
merge in klp-release history after reset to klp-dev
2013-09-17 17:39:56 -07:00
Mathias Agopian
e803e6095e
am 799f5126
: Fix build (tests)
...
* commit '799f51268006f319f6ae538dca670bfc7f522688':
Fix build (tests)
2013-09-17 15:58:55 -07:00
Mathias Agopian
799f512680
Fix build (tests)
...
Change-Id: I5b233ef448e5e7eec3818c6586dfea138b28f7b6
2013-09-17 15:55:18 -07:00
Mathias Agopian
3f342c1133
am 02b62df7
: Merge "Make sure do disconnect from a BQ when its client dies." into klp-dev
...
* commit '02b62df7119b27c89d91d96938d8f4f5232b296b':
Make sure do disconnect from a BQ when its client dies.
2013-09-17 14:33:09 -07:00
Mathias Agopian
02b62df711
Merge "Make sure do disconnect from a BQ when its client dies." into klp-dev
2013-09-17 21:31:14 +00:00
Aravind Akella
30480ac9f9
am fca43392
: Merge "Fix for AOSP fusion sensors not handling multiple clients correctly." into klp-dev
...
* commit 'fca43392b755b34c83c3abbfea216bafa9cd8171':
Fix for AOSP fusion sensors not handling multiple clients correctly.
2013-09-17 11:22:59 -07:00
Aravind Akella
fca43392b7
Merge "Fix for AOSP fusion sensors not handling multiple clients correctly." into klp-dev
2013-09-17 18:17:50 +00:00
Aravind Akella
47e300c4b4
am f0c72846
: Merge "Sensor Batching Bug fixes." into klp-dev
...
* commit 'f0c728465a87435e6a8a66991451cf6fe72acc24':
Sensor Batching Bug fixes.
2013-09-17 10:51:53 -07:00
Aravind Akella
f0c728465a
Merge "Sensor Batching Bug fixes." into klp-dev
2013-09-17 17:49:27 +00:00
Amith Yamasani
3e08bb7668
am fc7083a8
: Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
...
* commit 'fc7083a828b6db00698c1418e5f370b31625213c':
Enable FEATURE_DEVICE_ADMIN for handheld devices
2013-09-17 08:58:55 -07:00
Amith Yamasani
fc7083a828
Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
2013-09-17 15:56:24 +00:00
The Android Automerger
92d16bd3ee
merge in klp-release history after reset to klp-dev
2013-09-17 06:01:01 -07:00
Jesse Hall
b8080d9a3b
am 2a36497e
: Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev
...
* commit '2a36497e45d4d96e35fed89cfdcb09b71459ac3c':
Stop using default value for Surface producerControlledByApp parameter
2013-09-16 20:30:11 -07:00
Jesse Hall
2a36497e45
Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev
2013-09-17 03:27:15 +00:00
Mathias Agopian
365857df8b
Make sure do disconnect from a BQ when its client dies.
...
Bug: 5679534
Change-Id: If447e8673df83fe0b1d6210641e0a48522501a53
2013-09-16 16:15:21 -07:00
Aravind Akella
bf72deea2f
Fix for AOSP fusion sensors not handling multiple clients correctly.
...
Bug: 10786801
Change-Id: I7b938bc583a303a30237c3d93b5accbf64cc90b5
2013-09-16 15:49:49 -07:00
Jesse Hall
83cafffeac
Stop using default value for Surface producerControlledByApp parameter
...
Bug: 10785749
Change-Id: Ifbf9340e5eabe621a69e990ec3e05ac51f8db66a
2013-09-16 15:39:55 -07:00
Aravind Akella
4c8b951f8d
Sensor Batching Bug fixes.
...
i) SensorService dropping events. Increase SOCKET_BUFFER_SIZE in BitTube ctor.
ii) Call flush before every activate.
iii) Emulate flush for older devices. Add a trivial flush complete event when flush is called.
Bug: 10641596
Change-Id: I30d0f3948e830457143f16e157b6ad81908687ce
2013-09-16 14:43:02 -07:00
Jesse Hall
fccb7ac596
am a2ba428a
: Disable the egl_khr_gl_colorspace extension
...
* commit 'a2ba428a22125558a129c6ba4001dfc2169de2fe':
Disable the egl_khr_gl_colorspace extension
2013-09-16 12:44:40 -07:00
Jesse Hall
a2ba428a22
Disable the egl_khr_gl_colorspace extension
...
Bug: 10777398
Change-Id: Ib50ea8b9d5d960537701b85929d6312304993a0f
2013-09-16 11:21:48 -07:00
Amith Yamasani
7562c0e28f
Enable FEATURE_DEVICE_ADMIN for handheld devices
...
Bug: 9520957
Change-Id: I9c09dc726509db9e6d9ba4700255c74528b9f9fa
2013-09-16 10:48:35 -07:00
Kenny Root
06ef81bd70
resolved conflicts for merge of 1852eb4f
to klp-dev-plus-aosp
...
Change-Id: I7217c0e859b384a042c02fe339e745996c6ef49e
2013-09-12 11:51:34 -07:00
Kenny Root
1852eb4feb
Merge "Remove copy of UniquePtr.h"
2013-09-12 18:41:19 +00:00
The Android Automerger
3002db1c30
merge in klp-release history after reset to klp-dev
2013-09-12 06:01:32 -07:00
Mathias Agopian
7c4f236532
am 90ed3e8d
: fix a few problems with BitTube
...
* commit '90ed3e8d7883d9c80fb8bf11b1c593bd8b2b39d0':
fix a few problems with BitTube
2013-09-11 15:06:10 -07:00