Mathias Agopian
2c0a5e68aa
am e96e9e10
: fix a crasher in SurfaceTexture\'s setFilteringEnabled
...
* commit 'e96e9e1093b5700e9f403a6e2479da7dc36d3b71':
fix a crasher in SurfaceTexture's setFilteringEnabled
2012-09-24 20:56:05 -07:00
Mathias Agopian
e96e9e1093
fix a crasher in SurfaceTexture's setFilteringEnabled
...
bug: 7211067
Change-Id: Id8658a8df429d76c20ab9112858b38e52343dc9c
2012-09-24 19:26:11 -07:00
Mathias Agopian
c05d52fdd8
am e41c2e17
: am 13de3699
: Merge changes I47cd25c9,I7638ffe8 into jb-mr1-dev
...
* commit 'e41c2e17146423b6e11110f7d03caf5464283893':
don't call eglMakeCurrent() before calling HWC commit() on HWC 1.1
handle EGL errors
2012-09-24 18:34:56 -07:00
Mathias Agopian
e41c2e1714
am 13de3699
: Merge changes I47cd25c9,I7638ffe8 into jb-mr1-dev
...
* commit '13de3699807f3260cfbabd196a08191d6a80a99a':
don't call eglMakeCurrent() before calling HWC commit() on HWC 1.1
handle EGL errors
2012-09-24 18:33:54 -07:00
Mathias Agopian
13de369980
Merge changes I47cd25c9,I7638ffe8 into jb-mr1-dev
...
* changes:
don't call eglMakeCurrent() before calling HWC commit() on HWC 1.1
handle EGL errors
2012-09-24 18:31:48 -07:00
Jamie Gennis
651d23e6f7
am 483ab742
: am 2f45d746
: Merge "EGL: add the EGL_ANDROID_framebuffer_target enum" into jb-mr1-dev
...
* commit '483ab74243870e6af4b8a947873556ff86d076c0':
EGL: add the EGL_ANDROID_framebuffer_target enum
2012-09-24 18:25:05 -07:00
Jamie Gennis
f48bec48ea
am ca5f79c2
: am 363847d4
: Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev
...
* commit 'ca5f79c2bb6c2e3995d9e2427f2600d1b03a84c4':
EGL: expose the EXT_create_context_robustness ext
2012-09-24 18:25:04 -07:00
Jamie Gennis
483ab74243
am 2f45d746
: Merge "EGL: add the EGL_ANDROID_framebuffer_target enum" into jb-mr1-dev
...
* commit '2f45d7464a55d7a91da6fcd6f8cf1b11e395d029':
EGL: add the EGL_ANDROID_framebuffer_target enum
2012-09-24 18:23:05 -07:00
Jamie Gennis
ca5f79c2bb
am 363847d4
: Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev
...
* commit '363847d498bffe0e2d8e7b8aba693bb402513413':
EGL: expose the EXT_create_context_robustness ext
2012-09-24 18:23:04 -07:00
Jamie Gennis
2f45d7464a
Merge "EGL: add the EGL_ANDROID_framebuffer_target enum" into jb-mr1-dev
2012-09-24 18:21:14 -07:00
Jamie Gennis
363847d498
Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev
2012-09-24 18:20:51 -07:00
Mathias Agopian
2a23184e41
don't call eglMakeCurrent() before calling HWC commit() on HWC 1.1
...
this call is not needed and misleading on HWC 1.1; it can also have
a negative performance impact when multiple displays are used.
Bug: 7124069
Change-Id: I47cd25c9d6e69abcc9333b9ecd5044e8fb1919ec
2012-09-24 18:12:35 -07:00
Mathias Agopian
73d2a39400
am 0d45d711
: am 500407a2
: log an error when eglCreateContext() fails in an inconsistant way
...
* commit '0d45d711976bdca1165536b8948680680d38eb6a':
log an error when eglCreateContext() fails in an inconsistant way
2012-09-24 18:11:07 -07:00
Mathias Agopian
0d45d71197
am 500407a2
: log an error when eglCreateContext() fails in an inconsistant way
...
* commit '500407a2c07ced40c36e7356574a47bcec9c2fd9':
log an error when eglCreateContext() fails in an inconsistant way
2012-09-24 18:09:21 -07:00
Mathias Agopian
52e21483fa
handle EGL errors
...
for now we just restart the runtime.
bug: 7225248
Change-Id: I7638ffe82075a4db9e7e6f9e35cf48afcb5a387a
2012-09-24 18:07:21 -07:00
Mathias Agopian
500407a2c0
log an error when eglCreateContext() fails in an inconsistant way
...
this will help debugging bug: 7216919
Change-Id: I54ac65f20c5ed55cc93a5cbc5350fadfb0fcb804
2012-09-24 17:57:48 -07:00
Mathias Agopian
68872cac38
am 81b316aa
: am 98838aa0
: am 77af25b6
: Merge "Return back-end result from eglDestroyImageKHR"
...
* commit '81b316aa5395b6318ad4a10e1ed27d0b9b0df07f':
Return back-end result from eglDestroyImageKHR
2012-09-24 15:45:56 -07:00
Mathias Agopian
81b316aa53
am 98838aa0
: am 77af25b6
: Merge "Return back-end result from eglDestroyImageKHR"
...
* commit '98838aa0836518b7397cbfe763f34305e3387a5f':
Return back-end result from eglDestroyImageKHR
2012-09-24 15:43:54 -07:00
Mathias Agopian
98838aa083
am 77af25b6
: Merge "Return back-end result from eglDestroyImageKHR"
...
* commit '77af25b6dd41e76052b5b0ec6aaeebca896a4dbe':
Return back-end result from eglDestroyImageKHR
2012-09-24 15:42:06 -07:00
Mathias Agopian
77af25b6dd
Merge "Return back-end result from eglDestroyImageKHR"
2012-09-24 14:56:03 -07:00
Jamie Gennis
3ff48e5e69
EGL: add the EGL_ANDROID_framebuffer_target enum
...
Change-Id: Id8b1b114e2a7a88956b857c63a0429e9b33fdb5c
2012-09-24 13:45:33 -07:00
Jamie Gennis
09b11432b6
EGL: expose the EXT_create_context_robustness ext
...
Change-Id: I1db43e96aa5e9e91a6176a4a3e5aa9d1f3ee4a7e
2012-09-24 13:45:32 -07:00
Jamie Gennis
ded296a111
am 2cee285a
: am ff5c4aa6
: Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev
...
* commit '2cee285a97900cccd0992a274228ca806ba70884':
ConsumerBase: make fence names meaningful
2012-09-24 13:39:54 -07:00
Jamie Gennis
2cee285a97
am ff5c4aa6
: Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev
...
* commit 'ff5c4aa676d157f4911ef06e328e687725e8b9f9':
ConsumerBase: make fence names meaningful
2012-09-24 13:38:46 -07:00
Jamie Gennis
ff5c4aa676
Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev
2012-09-24 13:36:56 -07:00
Jamie Gennis
7aff4a5de4
ConsumerBase: make fence names meaningful
...
Change-Id: I3580120cb63c027c327e80ec70e68650b75395de
2012-09-24 12:25:53 -07:00
The Android Open Source Project
b285c18e8f
am 1dde9c32
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '1dde9c32f2ee61fc4043bebaae14a906ed4d26f7':
2012-09-24 10:15:00 -07:00
The Android Open Source Project
1dde9c32f2
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Id330f9144f47c1a9e314ac85b7b867cbfc7c27e8
2012-09-24 10:12:21 -07:00
Eino-Ville Talvala
d84bbc094e
am 4214402a
: am 33baee5d
: Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev
...
* commit '4214402aa22cfa9aa672045abab6b0a62a636722':
Add android.hardware.camera.any feature to camera permissions.
2012-09-24 09:33:52 -07:00
Mathias Agopian
4f3ad78093
am 511572b4
: am 9e2463e7
: add/remove displays properly on hotplug events
...
* commit '511572b465d981bbfe74969f879ee0ce042fa4bb':
add/remove displays properly on hotplug events
2012-09-24 09:33:51 -07:00
Eino-Ville Talvala
4214402aa2
am 33baee5d
: Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev
...
* commit '33baee5d88974a3b668f9d7f0716eed815966773':
Add android.hardware.camera.any feature to camera permissions.
2012-09-24 09:26:03 -07:00
Mathias Agopian
511572b465
am 9e2463e7
: add/remove displays properly on hotplug events
...
* commit '9e2463e71796964cfaa06bf09a880875ac3537bc':
add/remove displays properly on hotplug events
2012-09-24 09:26:02 -07:00
Mathias Agopian
7420665587
am 69954332
: am ff28e201
: Display events now always carry the display id they happened on
...
* commit '699543321402bcf908b41913aabceb72cd0bb618':
Display events now always carry the display id they happened on
2012-09-24 00:49:28 -07:00
Mathias Agopian
1d4bfef7cc
am 98cffd5c
: am b4d18ed3
: fix an issue where hotplug events were not dispatched
...
* commit '98cffd5cf9a248927ef8abfeb2bbd786b3f71fa4':
fix an issue where hotplug events were not dispatched
2012-09-24 00:49:27 -07:00
Jamie Gennis
cb8156e003
am f83c2720
: am 16cfa2e3
: Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev
...
* commit 'f83c2720c1aab9c361e8240575386081d5f496af':
SurfaceTexture: fix an out of bounds array write
2012-09-24 00:49:26 -07:00
Jamie Gennis
6a2f058458
am 849df8cd
: am e0606e29
: Merge "Add a spec for EGL_ANDROID_framebuffer_target." into jb-mr1-dev
...
* commit '849df8cd6baa26ef431404d1b1eea1e141eb5030':
Add a spec for EGL_ANDROID_framebuffer_target.
2012-09-24 00:48:43 -07:00
The Android Automerger
7fd6694905
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-23 18:59:59 -07:00
Ian Rogers
720501c8ef
Configure GC free to be 8MB for devices with >512MB RAM.
...
b/6606849
Change-Id: Idad46032b4b5d309db0319caeb7a1dfc0550f9f7
2012-09-23 16:41:57 -07:00
Eino-Ville Talvala
33baee5d88
Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev
2012-09-23 10:20:54 -07:00
Eino-Ville Talvala
e95822715e
Add android.hardware.camera.any feature to camera permissions.
...
Bug: 6847310
Change-Id: I9283932a7c211cd08b3b9fe6a93d8f219e6c9767
2012-09-23 09:53:51 -07:00
The Android Automerger
0615c8aba8
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-22 09:41:58 -07:00
Mathias Agopian
9e2463e717
add/remove displays properly on hotplug events
...
Bug: 7191563
Change-Id: I8f0fbf3b29658c9479443141798e6f288a1f2d52
2012-09-21 18:26:16 -07:00
Mathias Agopian
6995433214
am ff28e201
: Display events now always carry the display id they happened on
...
* commit 'ff28e201ec0c6d620eaaa29814ab52958487dc31':
Display events now always carry the display id they happened on
2012-09-21 14:55:43 -07:00
Mathias Agopian
98cffd5cf9
am b4d18ed3
: fix an issue where hotplug events were not dispatched
...
* commit 'b4d18ed34e3513f3a14ea0876c7e330bee72a529':
fix an issue where hotplug events were not dispatched
2012-09-21 14:55:42 -07:00
Jamie Gennis
f83c2720c1
am 16cfa2e3
: Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev
...
* commit '16cfa2e38bfbdafdba21af7f9f1c4d1418cbe1d3':
SurfaceTexture: fix an out of bounds array write
2012-09-21 14:55:41 -07:00
Mathias Agopian
ff28e201ec
Display events now always carry the display id they happened on
...
Change-Id: I12de1d883c23927722bc3a71b782f0079de4e831
2012-09-21 14:20:35 -07:00
Mathias Agopian
b4d18ed34e
fix an issue where hotplug events were not dispatched
...
Change-Id: I527eec77f338cd6f1a9021aa4c9d384dbddd6d2a
2012-09-21 14:20:35 -07:00
Jamie Gennis
16cfa2e38b
Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev
2012-09-21 13:43:24 -07:00
Jamie Gennis
849df8cd6b
am e0606e29
: Merge "Add a spec for EGL_ANDROID_framebuffer_target." into jb-mr1-dev
...
* commit 'e0606e29875a55dedc1a4f0a738d5eb40fe1eb41':
Add a spec for EGL_ANDROID_framebuffer_target.
2012-09-21 12:17:46 -07:00
Jamie Gennis
e0606e2987
Merge "Add a spec for EGL_ANDROID_framebuffer_target." into jb-mr1-dev
2012-09-21 12:16:38 -07:00