Commit Graph

48726 Commits

Author SHA1 Message Date
The Android Automerger
b6d04c2e82 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-06 05:55:30 -07:00
Marco Nelissen
3d3cc6e15e Merge "Report actual disk space used" into jb-mr2-dev 2013-05-05 01:17:48 +00:00
Mathias Agopian
192fa1f914 Merge "use a Framebuffer Object to render all screenshots" 2013-05-02 23:26:11 +00:00
Mathias Agopian
f03e51dd2f Merge "change how the userspace GLES drivers are named" 2013-05-02 23:25:52 +00:00
Dianne Hackborn
474c7b4c32 am ba018b3f: am 4fc27d79: Merge "Fix issue #8768456: Settings > App Info under reports..." into jb-mr2-dev
* commit 'ba018b3fa5ab6f40bdcc2af62ddeeebd7bad1ea5':
  Fix issue #8768456: Settings > App Info under reports...
2013-05-02 15:17:30 -07:00
Dianne Hackborn
ba018b3fa5 am 4fc27d79: Merge "Fix issue #8768456: Settings > App Info under reports..." into jb-mr2-dev
* commit '4fc27d79c29646b08ff059abc19cc4a7bccaa316':
  Fix issue #8768456: Settings > App Info under reports...
2013-05-02 15:15:17 -07:00
Dianne Hackborn
4fc27d79c2 Merge "Fix issue #8768456: Settings > App Info under reports..." into jb-mr2-dev 2013-05-02 22:11:17 +00:00
Jesse Hall
16b4f33d2b am 958ef3d7: am c8639351: Generate new EGLExt class
* commit '958ef3d79c48ddef3afa5327f7ed15a5ecfd2d1d':
  Generate new EGLExt class
2013-05-02 13:49:25 -07:00
Jesse Hall
958ef3d79c am c8639351: Generate new EGLExt class
* commit 'c86393510c8747519fe34e5aa38ce5218593c19c':
  Generate new EGLExt class
2013-05-02 13:48:00 -07:00
Jesse Hall
c86393510c Generate new EGLExt class
Initially populated with EGL_ANDROID_presentation_time (moved from the
EGL14 class) and the ES-relevant parts of EGL_KHR_create_context.

Bug: 8678160
Change-Id: Ifed2ee3da264ca701ae1f4b309a0758f7fcc3acc
2013-05-02 13:44:29 -07:00
Dianne Hackborn
8b41780d73 Fix issue #8768456: Settings > App Info under reports...
...app storage size for apps w/ .so files

The lib directories are tagged with the apk install number,
so must be explicitly passed down to installd.

Change-Id: Iae8815afd6ba964f5b2ed86a0d04a91827391ed6
2013-05-01 18:55:10 -07:00
Marco Nelissen
7719b85bf8 Report actual disk space used
Report size based on blocks used, not the "nominal" size.
b/8744465

Change-Id: Idbb72f47af6d475b51305a14be291bf01acb14bb
2013-05-01 10:10:59 -07:00
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