OSDN Git Service
The Android Open Source Project [Thu, 16 May 2013 12:48:22 +0000 (05:48 -0700)]
am
92cf3553: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
92cf355308ffb28f8a460d69915ca5955016a632':
The Android Open Source Project [Thu, 16 May 2013 12:43:41 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ic457c583534afce9b1697b3b34221a729e2bc5b2
Jesse Hall [Tue, 14 May 2013 06:31:54 +0000 (23:31 -0700)]
am
28fc78bf: am
e8fed71d: Merge "Abort surface composition if hw surface is invalid"
* commit '
28fc78bf5fbb6288a27f3f25565a960a1873b0ef':
Abort surface composition if hw surface is invalid
Jesse Hall [Tue, 14 May 2013 06:28:45 +0000 (23:28 -0700)]
am
e8fed71d: Merge "Abort surface composition if hw surface is invalid"
* commit '
e8fed71da2d3e03ef933d308520bab5b860f05aa':
Abort surface composition if hw surface is invalid
Jesse Hall [Tue, 14 May 2013 00:24:28 +0000 (00:24 +0000)]
Merge "Abort surface composition if hw surface is invalid"
Michael Chock [Mon, 4 Mar 2013 23:15:46 +0000 (15:15 -0800)]
Abort surface composition if hw surface is invalid
If an invalid display device is detected during surface composition
(e.g., a simulated secondary display is removed), abort the
composition.
Change-Id: Ia6afb2e287882d8ae0614eb25463d3f85b687adf
Jesse Hall [Mon, 13 May 2013 20:08:54 +0000 (13:08 -0700)]
am
7a486528: am
f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"
* commit '
7a4865287460a5f0ff26e22be5f0271735d32ac7':
gl_code.cpp: Remove a DOS style newline
Jesse Hall [Mon, 13 May 2013 20:05:36 +0000 (13:05 -0700)]
am
f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"
* commit '
f0dcff89acb998179757ca66b5c6a2c585a980e9':
gl_code.cpp: Remove a DOS style newline
Jesse Hall [Mon, 13 May 2013 18:53:10 +0000 (18:53 +0000)]
Merge "gl_code.cpp: Remove a DOS style newline"
The Android Automerger [Mon, 13 May 2013 12:55:40 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Sat, 11 May 2013 01:01:12 +0000 (18:01 -0700)]
take the "transparent region" into account for blending
until now it was only used to discard a layer entirely.
we're now reducing the size of the layer if it is still
visible, if possible.
this works for instance when a surfaceView is used and
only the menu bar is displayed over it.
Change-Id: I3f5527c5cd1e69ecc968272c8948f1513ada8c55
Mathias Agopian [Fri, 10 May 2013 03:37:10 +0000 (20:37 -0700)]
reformat Rect.{cpp|h}
Change-Id: I45b1f6646541a1abacce1e70df00a770e47b820e
Mathias Agopian [Thu, 9 May 2013 21:53:35 +0000 (14:53 -0700)]
make all libsurfaceflinger and libsensorservice symbols's visibility hidden
we only export the main entry-point.
this saves about 150KB.
Change-Id: I55eb2b6705386fdfa43860deb62f9cdd2a0982aa
Mathias Agopian [Thu, 9 May 2013 20:04:32 +0000 (13:04 -0700)]
remove unused declarations and reformat
Change-Id: I4e168fb62c275e02621c4b6e0c6000d0f006c327
Mathias Agopian [Thu, 9 May 2013 20:03:05 +0000 (13:03 -0700)]
remove reserved virtual slots
these consume small amount of space (plt) in every library that
links against libutils.
Change-Id: I1b6b3dd9098aa5a051243f7a5dbf91cd7dcb8b2c
Eino-Ville Talvala [Thu, 9 May 2013 17:19:01 +0000 (10:19 -0700)]
am
87ab83d9: am
f743e3db: Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
* commit '
87ab83d96b9d826e94a7169a6205bcf9c2ee633a':
Add support for HAL_PIXEL_FORMAT_YCbCr_420_888
Eino-Ville Talvala [Thu, 9 May 2013 17:15:17 +0000 (10:15 -0700)]
am
f743e3db: Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
* commit '
f743e3db27dd639421913ee5e99d7a13ccc236ea':
Add support for HAL_PIXEL_FORMAT_YCbCr_420_888
Eino-Ville Talvala [Thu, 9 May 2013 17:13:22 +0000 (17:13 +0000)]
Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
The Android Automerger [Thu, 9 May 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Thu, 9 May 2013 01:13:50 +0000 (01:13 +0000)]
Merge "new String8, String16 ctors to initialize empty static strings with static linkage"
Mathias Agopian [Wed, 8 May 2013 23:04:13 +0000 (16:04 -0700)]
new String8, String16 ctors to initialize empty static strings with static linkage
when libutils is statically linked, the ordering of the static
initializer is not guaranteed and therefore it's unsafe to use
empty static strings: e.g.:
static String8 sThisStaticStringIsNotSafe;
instead, this new constructor can be used:
static String8 sThisStaticStringIsSafe(kEmptyString);
Change-Id: Ia3daf1cab1c97d021c0ee9c2b394b5e27e8d6c0d
Jesse Hall [Wed, 8 May 2013 22:05:15 +0000 (15:05 -0700)]
am
dda42952: am
64f3b2fd: Merge "Remove experimental HWC virtual display support" into jb-mr2-dev
* commit '
dda4295221f831560ca9d554cd9b7be1c672d0b6':
Remove experimental HWC virtual display support
Jamie Gennis [Wed, 8 May 2013 22:03:56 +0000 (15:03 -0700)]
am
d2a92b5b: am
db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev
* commit '
d2a92b5b97b5a107d327744f216abdea8e0cda89':
atrace: add the 'dalvik' trace category
Jeff Tinker [Wed, 8 May 2013 22:03:40 +0000 (15:03 -0700)]
am
2c228354: am
b84d1cad: Correct native API documentation related to MediaDrm offline use case
* commit '
2c2283549c72184145c9f030bbfe6124ee75d169':
Correct native API documentation related to MediaDrm offline use case
Jesse Hall [Wed, 8 May 2013 20:57:56 +0000 (13:57 -0700)]
am
64f3b2fd: Merge "Remove experimental HWC virtual display support" into jb-mr2-dev
* commit '
64f3b2fd1ea9d30df6fd04ecdb086e540465bc18':
Remove experimental HWC virtual display support
Jesse Hall [Wed, 8 May 2013 20:53:42 +0000 (20:53 +0000)]
Merge "Remove experimental HWC virtual display support" into jb-mr2-dev
The Android Automerger [Wed, 8 May 2013 12:55:32 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Tue, 7 May 2013 03:20:50 +0000 (20:20 -0700)]
libutils clean-up
Change-Id: I6ff4cfc736751de2912c697f954e45e275f2d386
Jamie Gennis [Wed, 8 May 2013 01:23:18 +0000 (18:23 -0700)]
am
db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev
* commit '
db733579a4c64eddd7dadb4ac15f54658ccfc0fb':
atrace: add the 'dalvik' trace category
Jamie Gennis [Wed, 8 May 2013 01:21:17 +0000 (01:21 +0000)]
Merge "atrace: add the 'dalvik' trace category" into jb-mr2-dev
Jeff Tinker [Wed, 8 May 2013 00:20:56 +0000 (17:20 -0700)]
am
b84d1cad: Correct native API documentation related to MediaDrm offline use case
* commit '
b84d1cad1d481f75aa03d55ac07e4ff58dbfb84a':
Correct native API documentation related to MediaDrm offline use case
Todd Poynor [Tue, 7 May 2013 23:30:21 +0000 (23:30 +0000)]
Merge "String8: ensure static init done prior to empty string reference"
Erik Gilling [Tue, 7 May 2013 22:48:05 +0000 (22:48 +0000)]
Merge "flatland: add 1920x1200 to 16:10 resolutions"
Erik Gilling [Tue, 7 May 2013 22:47:54 +0000 (22:47 +0000)]
Merge "flatland: add 3:2 tests"
Jamie Gennis [Tue, 7 May 2013 22:20:39 +0000 (15:20 -0700)]
atrace: add the 'dalvik' trace category
Bug:
8856374
Change-Id: Ie7759328333d21d8123ce9d4f1a177cae5ede51e
Jeff Tinker [Tue, 7 May 2013 21:07:10 +0000 (14:07 -0700)]
Correct native API documentation related to MediaDrm offline use case
These doc updates were made previously to the java API but some
did not make it into the native API.
Change-Id: I9b7bfcd77bc593685254baca1c148deb7e1f91c7
related-to-bug:
8621588
Dianne Hackborn [Mon, 6 May 2013 21:25:20 +0000 (14:25 -0700)]
Add new Looper API to check whether the looper is idle.
This is just to support the watchdog to give it a faster
way to determine if a thread is deadlocked without having
to post a message to it.
Change-Id: I068dc8b9387caf94fe5811fb4aeb0f9b57b1a080
Erik Gilling [Tue, 7 May 2013 19:25:22 +0000 (12:25 -0700)]
flatland: add 1920x1200 to 16:10 resolutions
Change-Id: Ie7540c1ca4ec2c7ea8a307ce118d35479cdf499c
Erik Gilling [Tue, 7 May 2013 19:24:47 +0000 (12:24 -0700)]
flatland: add 3:2 tests
Change-Id: I90496207fbf972c9a8e6baa2188a7732a282f879
Todd Poynor [Thu, 2 May 2013 22:41:35 +0000 (15:41 -0700)]
String8: ensure static init done prior to empty string reference
Avoid NULL deref on static initialization of empty String8 objects prior
to libutils static init.
Change-Id: I3d420041ba62b97ed8c2dfd2532a2dcd72b84ff1
Jesse Hall [Tue, 7 May 2013 18:58:47 +0000 (11:58 -0700)]
Remove experimental HWC virtual display support
Bug:
8384764
Change-Id: I97b52ed83ad85466bd91cb9291308994048568a1
Dianne Hackborn [Tue, 7 May 2013 17:01:26 +0000 (10:01 -0700)]
am
ba8e30a3: am
223b953c: Add Dalvik heap definition for 7" xhdpi devices.
* commit '
ba8e30a31d54d11d826649bafc404e520d3c6fad':
Add Dalvik heap definition for 7" xhdpi devices.
The Android Automerger [Tue, 7 May 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Sun, 5 May 2013 01:07:43 +0000 (18:07 -0700)]
Add support for HAL_PIXEL_FORMAT_YCbCr_420_888
- Add fields to CpuConsumer::LockedBuffer for new information
- New lock methods for GraphicBuffer and GraphicBufferMapper for
the format
Bug:
8734880
Change-Id: If31f82c62d64b6942cf4cc6e5715585c03273f12
Dianne Hackborn [Mon, 6 May 2013 22:21:02 +0000 (15:21 -0700)]
am
223b953c: Add Dalvik heap definition for 7" xhdpi devices.
* commit '
223b953cf748d8197cba26545172db9dcaeea2b4':
Add Dalvik heap definition for 7" xhdpi devices.
Dianne Hackborn [Mon, 6 May 2013 22:06:20 +0000 (15:06 -0700)]
Add Dalvik heap definition for 7" xhdpi devices.
Change-Id: I6a8e406ee98d3061d498bb2fbd1b97aa9e79b4b5
Marco Nelissen [Mon, 6 May 2013 20:56:06 +0000 (13:56 -0700)]
am
3755dbec: am
3d3cc6e1: Merge "Report actual disk space used" into jb-mr2-dev
* commit '
3755dbec6f16330fb57b18c09319d209a3f8474f':
Report actual disk space used
Marco Nelissen [Mon, 6 May 2013 18:11:38 +0000 (11:11 -0700)]
am
3d3cc6e1: Merge "Report actual disk space used" into jb-mr2-dev
* commit '
3d3cc6e15ea6398105dc59d3135df3e64d5cf34e':
Report actual disk space used
The Android Automerger [Mon, 6 May 2013 12:55:30 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Marco Nelissen [Sun, 5 May 2013 01:17:48 +0000 (01:17 +0000)]
Merge "Report actual disk space used" into jb-mr2-dev
Mathias Agopian [Thu, 2 May 2013 23:26:10 +0000 (23:26 +0000)]
Merge "use a Framebuffer Object to render all screenshots"
Mathias Agopian [Thu, 2 May 2013 23:25:52 +0000 (23:25 +0000)]
Merge "change how the userspace GLES drivers are named"
Dianne Hackborn [Thu, 2 May 2013 22:17:30 +0000 (15:17 -0700)]
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...
Dianne Hackborn [Thu, 2 May 2013 22:15:17 +0000 (15:15 -0700)]
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...
Dianne Hackborn [Thu, 2 May 2013 22:11:17 +0000 (22:11 +0000)]
Merge "Fix issue #
8768456: Settings > App Info under reports..." into jb-mr2-dev
Jesse Hall [Thu, 2 May 2013 20:49:25 +0000 (13:49 -0700)]
am
958ef3d7: am
c8639351: Generate new EGLExt class
* commit '
958ef3d79c48ddef3afa5327f7ed15a5ecfd2d1d':
Generate new EGLExt class
Jesse Hall [Thu, 2 May 2013 20:48:00 +0000 (13:48 -0700)]
am
c8639351: Generate new EGLExt class
* commit '
c86393510c8747519fe34e5aa38ce5218593c19c':
Generate new EGLExt class
Jesse Hall [Tue, 30 Apr 2013 20:45:14 +0000 (13:45 -0700)]
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
Dianne Hackborn [Thu, 2 May 2013 01:55:10 +0000 (18:55 -0700)]
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
Marco Nelissen [Wed, 1 May 2013 17:10:59 +0000 (10:10 -0700)]
Report actual disk space used
Report size based on blocks used, not the "nominal" size.
b/
8744465
Change-Id: Idbb72f47af6d475b51305a14be291bf01acb14bb
The Android Automerger [Wed, 1 May 2013 12:55:47 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jesse Hall [Wed, 1 May 2013 02:34:49 +0000 (19:34 -0700)]
am
34c0fb18: am
cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
* commit '
34c0fb183767b80e93a7cd77233ead5fe50bd822':
Fix glGetUniformIndices JNI prototype
Jesse Hall [Wed, 1 May 2013 02:32:39 +0000 (19:32 -0700)]
am
cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
* commit '
cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a':
Fix glGetUniformIndices JNI prototype
Jesse Hall [Wed, 1 May 2013 02:30:47 +0000 (02:30 +0000)]
Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
Andy McFadden [Wed, 1 May 2013 00:47:26 +0000 (17:47 -0700)]
am
ef4dbb6a: am
5d46b04b: Merge "Recommend different time source" into jb-mr2-dev
* commit '
ef4dbb6af3db147f4c25ae1d7013b1a30fd8fed2':
Recommend different time source
Andy McFadden [Wed, 1 May 2013 00:45:36 +0000 (17:45 -0700)]
am
5d46b04b: Merge "Recommend different time source" into jb-mr2-dev
* commit '
5d46b04bd5a8ec00ea527b68aa48907d3978a007':
Recommend different time source
Andy McFadden [Wed, 1 May 2013 00:43:55 +0000 (00:43 +0000)]
Merge "Recommend different time source" into jb-mr2-dev
Jesse Hall [Mon, 29 Apr 2013 22:58:38 +0000 (15:58 -0700)]
Fix glGetUniformIndices JNI prototype
Bug:
8657863
Change-Id: I130d1b54d0cbd1f8613d3108482526d05d73d9e4
Andy McFadden [Fri, 26 Apr 2013 18:17:57 +0000 (11:17 -0700)]
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
Jamie Gennis [Mon, 29 Apr 2013 19:14:26 +0000 (12:14 -0700)]
am
8369c473: am
f6d1c393: EGL: expose the EGL_KHR_create_context extension
* commit '
8369c4739a58367e9636c84facc272cf8ddcb070':
EGL: expose the EGL_KHR_create_context extension
Mathias Agopian [Wed, 24 Apr 2013 17:03:08 +0000 (19:03 +0200)]
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
Andy McFadden [Mon, 29 Apr 2013 18:22:25 +0000 (18:22 +0000)]
Merge "Fix range check"
The Android Automerger [Mon, 29 Apr 2013 12:55:47 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Bjorn Bringert [Mon, 29 Apr 2013 10:10:41 +0000 (10:10 +0000)]
Merge "Build a static device libutils"
Jamie Gennis [Sat, 27 Apr 2013 00:54:02 +0000 (17:54 -0700)]
am
f6d1c393: EGL: expose the EGL_KHR_create_context extension
* commit '
f6d1c3930eeba6b089ba12fb82ecad1c6622e550':
EGL: expose the EGL_KHR_create_context extension
Mathias Agopian [Tue, 23 Apr 2013 18:52:29 +0000 (20:52 +0200)]
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
Bjorn Bringert [Fri, 22 Mar 2013 14:26:33 +0000 (14:26 +0000)]
Build a static device libutils
This is needed to make tools such as aapt more compatible when
built for the device.
Change-Id: I1261d47b6e24595f1be547b9202892863f66a1de
Jamie Gennis [Fri, 26 Apr 2013 01:48:41 +0000 (18:48 -0700)]
EGL: expose the EGL_KHR_create_context extension
Bug:
8616866
Change-Id: Ic60f9f21397a1760c552b6f141d5177d1cbaf1f8
Andy McFadden [Thu, 25 Apr 2013 22:58:25 +0000 (15:58 -0700)]
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
Jamie Gennis [Thu, 25 Apr 2013 20:50:38 +0000 (13:50 -0700)]
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
Jamie Gennis [Thu, 25 Apr 2013 19:41:28 +0000 (12:41 -0700)]
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
Jamie Gennis [Thu, 25 Apr 2013 19:39:10 +0000 (19:39 +0000)]
Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev
The Android Automerger [Wed, 24 Apr 2013 12:55:32 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Wed, 24 Apr 2013 10:27:07 +0000 (10:27 +0000)]
Merge "fix a typo in EGL loader"
Mathias Agopian [Wed, 24 Apr 2013 10:25:33 +0000 (10:25 +0000)]
Merge changes I0d9f18d1,Ib96c9161
* changes:
Add a --color option to dumpsys SurfaceFlinger
clean-up/simplify all dump() APIs
Jamie Gennis [Tue, 23 Apr 2013 22:00:45 +0000 (15:00 -0700)]
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
Matthew Xie [Tue, 23 Apr 2013 22:54:56 +0000 (15:54 -0700)]
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
Matthew Xie [Tue, 23 Apr 2013 22:52:54 +0000 (15:52 -0700)]
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
Matthew Xie [Tue, 23 Apr 2013 22:47:36 +0000 (22:47 +0000)]
Merge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev
Matthew Xie [Thu, 18 Apr 2013 22:32:04 +0000 (15:32 -0700)]
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
Mathias Agopian [Tue, 23 Apr 2013 18:16:44 +0000 (11:16 -0700)]
am
3cf76aff: am
e692ab9a: fix uninitialized variables in GLConsumer
* commit '
3cf76affd3ef28759789622e9e0134bdb045418b':
fix uninitialized variables in GLConsumer
The Android Automerger [Tue, 23 Apr 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Tue, 23 Apr 2013 12:14:06 +0000 (14:14 +0200)]
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
Mathias Agopian [Tue, 23 Apr 2013 10:50:30 +0000 (03:50 -0700)]
am
e692ab9a: fix uninitialized variables in GLConsumer
* commit '
e692ab9a6be63193c5b52a6562d85d06c40463b8':
fix uninitialized variables in GLConsumer
Mathias Agopian [Mon, 22 Apr 2013 15:52:16 +0000 (17:52 +0200)]
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
Mathias Agopian [Mon, 22 Apr 2013 14:55:35 +0000 (16:55 +0200)]
clean-up/simplify all dump() APIs
remove the scratch buffer parameter and use
String8::appendFormat() instead.
Change-Id: Ib96c91617c8e7292de87433d15cf6232b7d591b0
The Android Automerger [Mon, 22 Apr 2013 12:55:39 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Mon, 22 Apr 2013 09:24:02 +0000 (11:24 +0200)]
fix uninitialized variables in GLConsumer
mDefaultWidth, mDefaultHeight and mCurrentScallingMode are now
initialized to the same default value that BufferQueue uses.
Change-Id: I0d4da2022b06419d12745716d8ddbd48c8869953
Mathias Agopian [Fri, 19 Apr 2013 01:15:58 +0000 (18:15 -0700)]
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
Mathias Agopian [Fri, 19 Apr 2013 01:11:55 +0000 (18:11 -0700)]
am
bd115338: allow dumpsys SurfaceFlinger in user builds from the shell user
* commit '
bd1153382e7a9d89922bea999a52ca21d46d6caa':
allow dumpsys SurfaceFlinger in user builds from the shell user