The Android Automerger
4d93cbf709
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-01 05:55:47 -07:00
Jesse Hall
c59db7fdfe
am 34c0fb18
: am cc8f8ad3
: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
...
* commit '34c0fb183767b80e93a7cd77233ead5fe50bd822':
Fix glGetUniformIndices JNI prototype
2013-04-30 19:34:49 -07:00
Jesse Hall
34c0fb1837
am cc8f8ad3
: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
...
* commit 'cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a':
Fix glGetUniformIndices JNI prototype
2013-04-30 19:32:39 -07:00
Jesse Hall
cc8f8ad33d
Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
2013-05-01 02:30:48 +00:00
Andy McFadden
80f9f26d10
am ef4dbb6a
: am 5d46b04b
: Merge "Recommend different time source" into jb-mr2-dev
...
* commit 'ef4dbb6af3db147f4c25ae1d7013b1a30fd8fed2':
Recommend different time source
2013-04-30 17:47:26 -07:00
Andy McFadden
ef4dbb6af3
am 5d46b04b
: Merge "Recommend different time source" into jb-mr2-dev
...
* commit '5d46b04bd5a8ec00ea527b68aa48907d3978a007':
Recommend different time source
2013-04-30 17:45:36 -07:00
Andy McFadden
5d46b04bd5
Merge "Recommend different time source" into jb-mr2-dev
2013-05-01 00:43:55 +00:00
Jesse Hall
46fc9cb60c
Fix glGetUniformIndices JNI prototype
...
Bug: 8657863
Change-Id: I130d1b54d0cbd1f8613d3108482526d05d73d9e4
2013-04-29 16:01:56 -07:00
Andy McFadden
0e775697fb
Recommend different time source
...
We were recommending SystemClock#uptimeMillis() from Java code, but
millisecond resolution is a little coarse. We don't have an
appropriate call in SystemClock, so use System.nanoTime() instead.
Bug 8733179
Change-Id: Ifb85a03eabf7ff168966adcb5ed5914bbf3884b2
2013-04-29 15:41:40 -07:00
Jamie Gennis
565bce248b
am 8369c473
: am f6d1c393
: EGL: expose the EGL_KHR_create_context extension
...
* commit '8369c4739a58367e9636c84facc272cf8ddcb070':
EGL: expose the EGL_KHR_create_context extension
2013-04-29 12:14:26 -07:00
Mathias Agopian
0aea53ff3f
use a Framebuffer Object to render all screenshots
...
this allows us to render into a buffer with a
pixelformat of our own choice; this is much faster
on all platform.
Bug: 8582615
Change-Id: I61298fc8e43fa6f92044c5123955cb5c7897dab7
2013-04-29 21:06:06 +02:00
Andy McFadden
5075b21e1a
Merge "Fix range check"
2013-04-29 18:22:25 +00:00
The Android Automerger
31c68a5b6f
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-29 05:55:47 -07:00
Bjorn Bringert
b1b307ec3f
Merge "Build a static device libutils"
2013-04-29 10:10:41 +00:00
Jamie Gennis
8369c4739a
am f6d1c393
: EGL: expose the EGL_KHR_create_context extension
...
* commit 'f6d1c3930eeba6b089ba12fb82ecad1c6622e550':
EGL: expose the EGL_KHR_create_context extension
2013-04-26 17:54:02 -07:00
Mathias Agopian
993814255f
change how the userspace GLES drivers are named
...
for single library:
/vendor/lib/egl/GLES.so
for multiple libraries:
/vendor/lib/egl/EGL.so
/vendor/lib/egl/GLESv1_CM.so
/vendor/lib/egl/GLESv2.so
EGL_BOARD_CONFIG as well as egl.cfg are not needed anymore.
To facilitate the transition, the loader will also look
for the older naming scheme.
Bug: 8631636
Change-Id: Id4b113468df29bae72b323f76598229914e1c7a1
2013-04-26 23:49:01 +02:00
Bjorn Bringert
f19c4ae816
Build a static device libutils
...
This is needed to make tools such as aapt more compatible when
built for the device.
Change-Id: I1261d47b6e24595f1be547b9202892863f66a1de
2013-04-26 15:12:47 +01:00
Jamie Gennis
f6d1c3930e
EGL: expose the EGL_KHR_create_context extension
...
Bug: 8616866
Change-Id: Ic60f9f21397a1760c552b6f141d5177d1cbaf1f8
2013-04-25 18:49:15 -07:00
Andy McFadden
42137d2e72
Fix range check
...
The getarray() function checks to see if there's enough room in
the buffer, but it's using a byte count for the available size
and a possibly non-byte count for the space required. Dividing
down by the unit size corrects the problem.
Bug 8713753
Change-Id: Id42c0df65c3233dcc5f76d05e229f7d40d4c1f99
2013-04-25 15:58:25 -07:00
Jamie Gennis
748b696c05
am 83ad8957
: am 5b6ebd71
: Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev
...
* commit '83ad89579e22228c1a48a2a488b86fc0d41057a6':
libgui_test: fix a couple minor test issues
2013-04-25 13:50:38 -07:00
Jamie Gennis
83ad89579e
am 5b6ebd71
: Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev
...
* commit '5b6ebd716c2bae657898562997ebb3b7d7b8a575':
libgui_test: fix a couple minor test issues
2013-04-25 12:41:28 -07:00
Jamie Gennis
5b6ebd716c
Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev
2013-04-25 19:39:10 +00:00
The Android Automerger
726ca9c5de
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-24 05:55:32 -07:00
Mathias Agopian
743ec69e51
Merge "fix a typo in EGL loader"
2013-04-24 10:27:07 +00:00
Mathias Agopian
bdcf1fe2ba
Merge changes I0d9f18d1,Ib96c9161
...
* changes:
Add a --color option to dumpsys SurfaceFlinger
clean-up/simplify all dump() APIs
2013-04-24 10:25:34 +00:00
Jamie Gennis
ea2d942dda
libgui_test: fix a couple minor test issues
...
This change fixes how the MultiTextureConsumerTest.EGLImageTargetWorks checks
for pixels. It removes the call to eglSwapBuffers so that the test does not
rely on EGL swap-preserve behavior, and it makes the test use checkPixel()
rather than doing glReadPixels itself.
Bug: 8349336
Change-Id: I0f446a0083eebd07af6fd208762878b4e367725a
2013-04-24 01:08:02 +00:00
Matthew Xie
1e5baa4e7d
am ae5fa5a2
: am 3cf12f41
: Merge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev
...
* commit 'ae5fa5a2f790d5691f52b8000d4a8708d596ccbc':
Add hardware feature android.hardware.bluetooth.le xml file
2013-04-23 15:54:56 -07:00
Matthew Xie
ae5fa5a2f7
am 3cf12f41
: Merge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev
...
* commit '3cf12f4112167cb3372cbdba2b66d48a5d56dc4b':
Add hardware feature android.hardware.bluetooth.le xml file
2013-04-23 15:52:54 -07:00
Matthew Xie
3cf12f4112
Merge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev
2013-04-23 22:47:36 +00:00
Matthew Xie
3dacc3f1a3
Add hardware feature android.hardware.bluetooth.le xml file
...
The feature is used to differ platforms that support bluetooth low
engery radio
bug 8369273
Change-Id: I8714b6b03a4e5692d4573ea7c156b002b7ee42dd
2013-04-23 11:58:44 -07:00
Mathias Agopian
6bbd8e30b5
am 3cf76aff
: am e692ab9a
: fix uninitialized variables in GLConsumer
...
* commit '3cf76affd3ef28759789622e9e0134bdb045418b':
fix uninitialized variables in GLConsumer
2013-04-23 11:16:44 -07:00
The Android Automerger
e215b2e59b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-23 05:55:29 -07:00
Mathias Agopian
b4ba50dd83
fix a typo in EGL loader
...
the code intended to filter out the software-renderer, but the
test as written was essentially a no-op.
the problem didn't happen most of the time because we had
updated egl.cfg to not even list the software renderer.
the test as written didn't generate a compile-time error
because String8 has a const char* cast operator; but the
end result was to compare pointers instead of the string
itself.
http://code.google.com/p/android/issues/detail?id=54606
Change-Id: I739dd1c838fbc24c5643a631fae19713a8ef1717
2013-04-23 14:20:16 +02:00
Mathias Agopian
3cf76affd3
am e692ab9a
: fix uninitialized variables in GLConsumer
...
* commit 'e692ab9a6be63193c5b52a6562d85d06c40463b8':
fix uninitialized variables in GLConsumer
2013-04-23 03:50:30 -07:00
Mathias Agopian
3e25fd8609
Add a --color option to dumpsys SurfaceFlinger
...
colorize a bit the output of dumpsys SurfaceFlinger to
make it easier to read. Right now it will bold the
title of each section and use green for the name of
each layer.
Change-Id: I0d9f18d115401cb45109d244ef3a278481f68cc6
2013-04-22 21:51:28 +02:00
Mathias Agopian
74d211ae26
clean-up/simplify all dump() APIs
...
remove the scratch buffer parameter and use
String8::appendFormat() instead.
Change-Id: Ib96c91617c8e7292de87433d15cf6232b7d591b0
2013-04-22 21:51:28 +02:00
The Android Automerger
43ece4ff7b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-22 05:55:39 -07:00
Mathias Agopian
e692ab9a6b
fix uninitialized variables in GLConsumer
...
mDefaultWidth, mDefaultHeight and mCurrentScallingMode are now
initialized to the same default value that BufferQueue uses.
Change-Id: I0d4da2022b06419d12745716d8ddbd48c8869953
2013-04-22 11:24:02 +02:00
Mathias Agopian
dfc11ac5c2
am 93a9e03d
: am bd115338
: allow dumpsys SurfaceFlinger in user builds from the shell user
...
* commit '93a9e03d2a7458398a17f2dc7434d7b385ed31d7':
allow dumpsys SurfaceFlinger in user builds from the shell user
2013-04-18 18:15:58 -07:00
Mathias Agopian
93a9e03d2a
am bd115338
: allow dumpsys SurfaceFlinger in user builds from the shell user
...
* commit 'bd1153382e7a9d89922bea999a52ca21d46d6caa':
allow dumpsys SurfaceFlinger in user builds from the shell user
2013-04-18 18:11:55 -07:00
Mathias Agopian
bd1153382e
allow dumpsys SurfaceFlinger in user builds from the shell user
...
Bug: 8659013
Change-Id: I1de43bb5808cb8c1103cfc73dca59ff70fc13f91
2013-04-18 16:41:04 -07:00
The Android Automerger
7161211b7a
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-18 05:55:41 -07:00
Jaikumar Ganesh
4390825a6f
am 7c043486
: am 379f0f04
: Merge "Fix activation issue with auto disabled sensors." into jb-mr2-dev
...
* commit '7c0434861eb2ac6c408e5f56b5c8ced6da1beaf3':
Fix activation issue with auto disabled sensors.
2013-04-17 22:00:50 -07:00
Jaikumar Ganesh
7c0434861e
am 379f0f04
: Merge "Fix activation issue with auto disabled sensors." into jb-mr2-dev
...
* commit '379f0f04cca66b5fe3dcd96ef81b267d8fc0de03':
Fix activation issue with auto disabled sensors.
2013-04-17 21:58:12 -07:00
Jaikumar Ganesh
379f0f04cc
Merge "Fix activation issue with auto disabled sensors." into jb-mr2-dev
2013-04-18 04:56:29 +00:00
Jaikumar Ganesh
4c01b1ad80
Fix activation issue with auto disabled sensors.
...
Auto disabled sensors get auto disabled after trigger.
An activation after this wasn't working because the
state was not being reset.
b/8609561
Change-Id: If72c9f27345e91671d7ad0a7a066f6dc3d255b78
2013-04-17 14:58:22 -07:00
Igor Murashkin
6ca04ca755
am f3d93d43
: am 187edf93
: Merge "BufferItemConsumer: add functions to set default buffer format/size" into jb-mr2-dev
...
* commit 'f3d93d436373dcc39ff0b7f4aac938f4619421a2':
BufferItemConsumer: add functions to set default buffer format/size
2013-04-17 12:48:23 -07:00
Igor Murashkin
f3d93d4363
am 187edf93
: Merge "BufferItemConsumer: add functions to set default buffer format/size" into jb-mr2-dev
...
* commit '187edf93c6245bb8fb3187c49f2174492ed6e049':
BufferItemConsumer: add functions to set default buffer format/size
2013-04-17 12:44:23 -07:00
Igor Murashkin
187edf93c6
Merge "BufferItemConsumer: add functions to set default buffer format/size" into jb-mr2-dev
2013-04-17 19:39:53 +00:00
The Android Automerger
2e4bbb12eb
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-17 05:55:32 -07:00