OSDN Git Service
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
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
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"
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
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
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
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
Mathias Agopian [Thu, 18 Apr 2013 23:41:04 +0000 (16:41 -0700)]
allow dumpsys SurfaceFlinger in user builds from the shell user
Bug:
8659013
Change-Id: I1de43bb5808cb8c1103cfc73dca59ff70fc13f91
Jaikumar Ganesh [Thu, 18 Apr 2013 05:00:50 +0000 (22:00 -0700)]
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.
Jaikumar Ganesh [Thu, 18 Apr 2013 04:58:12 +0000 (21:58 -0700)]
am
379f0f04: Merge "Fix activation issue with auto disabled sensors." into jb-mr2-dev
* commit '
379f0f04cca66b5fe3dcd96ef81b267d8fc0de03':
Fix activation issue with auto disabled sensors.
Jaikumar Ganesh [Thu, 18 Apr 2013 04:56:29 +0000 (04:56 +0000)]
Merge "Fix activation issue with auto disabled sensors." into jb-mr2-dev
Jaikumar Ganesh [Tue, 16 Apr 2013 22:52:23 +0000 (15:52 -0700)]
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
Igor Murashkin [Wed, 17 Apr 2013 19:48:23 +0000 (12:48 -0700)]
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
Igor Murashkin [Wed, 17 Apr 2013 19:44:23 +0000 (12:44 -0700)]
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
Igor Murashkin [Wed, 17 Apr 2013 19:39:52 +0000 (19:39 +0000)]
Merge "BufferItemConsumer: add functions to set default buffer format/size" into jb-mr2-dev
Mathias Agopian [Wed, 17 Apr 2013 06:40:05 +0000 (23:40 -0700)]
am
cf73e1fd: am
f31510a2: Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
* commit '
cf73e1fd8a0a3372ff91e0485b37680262f5df95':
Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
Mathias Agopian [Wed, 17 Apr 2013 06:36:58 +0000 (23:36 -0700)]
am
f31510a2: Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
* commit '
f31510a2ac0807cf3d4224a73fc3f8f691f42f5a':
Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
Mathias Agopian [Wed, 17 Apr 2013 06:32:38 +0000 (23:32 -0700)]
Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
Bug:
8395618
Change-Id: I160d29699593b11058533ca753e275d5deeb3b54
Mathias Agopian [Wed, 17 Apr 2013 00:06:46 +0000 (17:06 -0700)]
am
eb3610e4: am
ed6d08b7: fix "traceGpuCompletion" debug feature
* commit '
eb3610e4d0581e5b3a0bb6d4c4d02d24e453cc93':
fix "traceGpuCompletion" debug feature
Mathias Agopian [Wed, 17 Apr 2013 00:04:42 +0000 (17:04 -0700)]
am
ed6d08b7: fix "traceGpuCompletion" debug feature
* commit '
ed6d08b70d775852f4827471814c83eba3606aaa':
fix "traceGpuCompletion" debug feature
Mathias Agopian [Tue, 16 Apr 2013 23:39:46 +0000 (16:39 -0700)]
fix "traceGpuCompletion" debug feature
eglCreateSyncKHR requires a call to glFlush which we were not doing.
fixed by moving the code above eglSwapBuffers(), which both
fixes the problem and gives us a slightly better idea of when
the GPU is done drawing.
Change-Id: Ic826ef1fe25a6247742c3d49d0cb69f4031e3593
Jesse Hall [Tue, 16 Apr 2013 21:33:32 +0000 (14:33 -0700)]
am
29bdde08: am
2f67faeb: Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f,I02a1548a,I638a36b0,I814befe2,Iaaef7d53,I349575e5,I0b5acc78,I6fad8803 into jb-mr2-dev
* commit '
29bdde08db2890f4197ae7f2b253f251468980ab':
Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX
Special-case glGetActiveUniformBlockName
Special-case glGetStringi
Special-case glMapBufferRange
Special-case glGetBufferPointerv
Special-case glGetUniformIndices
Special-case glGetTransformFeedbackVarying
Special-case glTransformFeedbackVaryings
Add buffer object versions of several functions
Add *int64 and GLsync types and related functions
Add ES3 functions and constants, difficult ones commented out
Support "const GLChar*" and "const GLenum*" types
Minor changes to ES3 functions inherited from ES2
Generate GLES30 class, just a clone of GLES20 for now
Jesse Hall [Tue, 16 Apr 2013 21:31:17 +0000 (14:31 -0700)]
am
2f67faeb: Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f,I02a1548a,I638a36b0,I814befe2,Iaaef7d53,I349575e5,I0b5acc78,I6fad8803 into jb-mr2-dev
* commit '
2f67faeb801dd6eb8fff8f8aab3843f2532c941d':
Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX
Special-case glGetActiveUniformBlockName
Special-case glGetStringi
Special-case glMapBufferRange
Special-case glGetBufferPointerv
Special-case glGetUniformIndices
Special-case glGetTransformFeedbackVarying
Special-case glTransformFeedbackVaryings
Add buffer object versions of several functions
Add *int64 and GLsync types and related functions
Add ES3 functions and constants, difficult ones commented out
Support "const GLChar*" and "const GLenum*" types
Minor changes to ES3 functions inherited from ES2
Generate GLES30 class, just a clone of GLES20 for now
Jesse Hall [Tue, 16 Apr 2013 21:29:39 +0000 (21:29 +0000)]
Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f,I02a1548a,I638a36b0,I814befe2,Iaaef7d53,I349575e5,I0b5acc78,I6fad8803 into jb-mr2-dev
* changes:
Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX
Special-case glGetActiveUniformBlockName
Special-case glGetStringi
Special-case glMapBufferRange
Special-case glGetBufferPointerv
Special-case glGetUniformIndices
Special-case glGetTransformFeedbackVarying
Special-case glTransformFeedbackVaryings
Add buffer object versions of several functions
Add *int64 and GLsync types and related functions
Add ES3 functions and constants, difficult ones commented out
Support "const GLChar*" and "const GLenum*" types
Minor changes to ES3 functions inherited from ES2
Generate GLES30 class, just a clone of GLES20 for now
Igor Murashkin [Tue, 16 Apr 2013 18:24:40 +0000 (11:24 -0700)]
BufferItemConsumer: add functions to set default buffer format/size
Bug:
8629088
Change-Id: I06f2e26a70d6dbcfcd70b08b4461e8e401f6e83f
Jesse Hall [Mon, 15 Apr 2013 23:35:08 +0000 (16:35 -0700)]
Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX
Bug:
8566953
Change-Id: I66085c300a8658a4018796645257edb73be94719
The Android Open Source Project [Mon, 15 Apr 2013 17:48:58 +0000 (10:48 -0700)]
am
987f727d: Reconcile with jb-mr2-release - do not merge
* commit '
987f727da2f90d428ae773a58cafc4ea67737aab':
Improve screenshot performance on some devices (DO NOT MERGE)
The Android Open Source Project [Mon, 15 Apr 2013 17:46:12 +0000 (10:46 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I98befd6a263feb5235d4a8aa20abff47a2a8a097
The Android Automerger [Mon, 15 Apr 2013 12:55:54 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jesse Hall [Sat, 13 Apr 2013 21:23:04 +0000 (14:23 -0700)]
am
0c3b9112: am
883daf6e: Merge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev
* commit '
0c3b91120788d2f09cf8e8617cfe7b9ee705ba44':
Make gen more readable, use UNIX-style line endings
Jesse Hall [Sat, 13 Apr 2013 21:21:01 +0000 (14:21 -0700)]
am
883daf6e: Merge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev
* commit '
883daf6eed36c11a7cb458f07a88e7a9cea29c27':
Make gen more readable, use UNIX-style line endings
Jesse Hall [Sat, 13 Apr 2013 21:18:25 +0000 (21:18 +0000)]
Merge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev
Mathias Agopian [Sat, 13 Apr 2013 01:05:40 +0000 (18:05 -0700)]
am
d7932a62: am
48be3232: Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev
* commit '
d7932a62d091df1559a47004670a951d8ab9c7f1':
make sure to update the "current state" when we "fake" the transaction
Jaikumar Ganesh [Sat, 13 Apr 2013 01:05:35 +0000 (18:05 -0700)]
am
e4f0dc30: am
2ea0c67d: Merge "Sensor changes." into jb-mr2-dev
* commit '
e4f0dc300a22dbcd9081558d2844c6062b4cd380':
Sensor changes.
Mathias Agopian [Sat, 13 Apr 2013 00:32:30 +0000 (17:32 -0700)]
am
48be3232: Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev
* commit '
48be323236f9fc41620a17e182eea800351812c5':
make sure to update the "current state" when we "fake" the transaction
Mathias Agopian [Sat, 13 Apr 2013 00:27:31 +0000 (00:27 +0000)]
Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev
Jaikumar Ganesh [Sat, 13 Apr 2013 00:25:38 +0000 (17:25 -0700)]
am
2ea0c67d: Merge "Sensor changes." into jb-mr2-dev
* commit '
2ea0c67da6770a840d871a69c61bb52d73dadf2b':
Sensor changes.
Jaikumar Ganesh [Sat, 13 Apr 2013 00:22:38 +0000 (00:22 +0000)]
Merge "Sensor changes." into jb-mr2-dev
Dianne Hackborn [Sat, 13 Apr 2013 00:10:04 +0000 (17:10 -0700)]
am
0c71bb90: am
9380d78c: Add new resources trace.
* commit '
0c71bb90f96f485940fd3b73c307fedee958042d':
Add new resources trace.
Dianne Hackborn [Sat, 13 Apr 2013 00:06:29 +0000 (17:06 -0700)]
am
9380d78c: Add new resources trace.
* commit '
9380d78c98d8b8fbce9ade5881fab7134fadc015':
Add new resources trace.
Dianne Hackborn [Fri, 12 Apr 2013 21:52:35 +0000 (14:52 -0700)]
Add new resources trace.
Change-Id: Iab8c1ef51f491e818fb4bab0ba7a042f0d9bec9a
Mathias Agopian [Fri, 12 Apr 2013 23:58:11 +0000 (16:58 -0700)]
make sure to update the "current state" when we "fake" the transaction
this mimics the code we used for the size. basically we need to
also update the "current state" because it gets copied to the
"drawing state" when a transaction occurs, and it would
"undo" our change.
Bug:
8511430
Bug:
8581533
Change-Id: I08c02abbf21b7f168f7124cd14ee717d7d3d502c
Jaikumar Ganesh [Mon, 8 Apr 2013 23:43:12 +0000 (16:43 -0700)]
Sensor changes.
1. Some sensors can wake up the AP. Add wakelocks.
2. Handle backward compatibility for rotation vector
heading accuracy.
3. Cleanup auto disabled sensors.
4. Fix race condition between enable and dispatch.
Change-Id: I39dddf12e208d83cd288201986ee994312555820
Chet Haase [Fri, 12 Apr 2013 14:16:28 +0000 (07:16 -0700)]
am
27ff54db: am
5e5bed60: Merge "DO NOT MERGE Make sure surfaces always have latest orientation info" into jb-mr2-dev
* commit '
27ff54dbb4089626f694339ee0f54c38b8688537':
DO NOT MERGE Make sure surfaces always have latest orientation info
Chet Haase [Fri, 12 Apr 2013 14:13:55 +0000 (07:13 -0700)]
am
5e5bed60: Merge "DO NOT MERGE Make sure surfaces always have latest orientation info" into jb-mr2-dev
* commit '
5e5bed60d03b5556ada351b010ed14ae8f1515ae':
DO NOT MERGE Make sure surfaces always have latest orientation info
Chet Haase [Fri, 12 Apr 2013 14:11:53 +0000 (14:11 +0000)]
Merge "DO NOT MERGE Make sure surfaces always have latest orientation info" into jb-mr2-dev
Mathias Agopian [Thu, 11 Apr 2013 05:55:41 +0000 (22:55 -0700)]
Improve screenshot performance on some devices (DO NOT MERGE)
this affects devices that need a glReadPixels(). We use
a FBO instead of a GlConsumer as an intermediate render target, this
saves 2 calls to eglMakeCurrent().
On Galaxy Nexus this allows us to go from ~135ms to ~35ms for
recent's screenshots.
Bug:
8582615
Change-Id: I6b25291ecc235f1927579bbb2db3c731e985c6e8
Mathias Agopian [Fri, 12 Apr 2013 03:25:53 +0000 (20:25 -0700)]
am
5297a0a2: am
453cfe0b: Merge "Improve screenshot performance on some devices (DO NOT MERGE)" into jb-mr2-dev
* commit '
5297a0a2093c7908488b172855619bc6763526e3':
Improve screenshot performance on some devices (DO NOT MERGE)
Mathias Agopian [Fri, 12 Apr 2013 03:22:23 +0000 (20:22 -0700)]
am
453cfe0b: Merge "Improve screenshot performance on some devices (DO NOT MERGE)" into jb-mr2-dev
* commit '
453cfe0bfe06f3cbd87c8c42fa641756ab466b06':
Improve screenshot performance on some devices (DO NOT MERGE)
Mathias Agopian [Fri, 12 Apr 2013 03:18:17 +0000 (03:18 +0000)]
Merge "Improve screenshot performance on some devices (DO NOT MERGE)" into jb-mr2-dev
Mathias Agopian [Thu, 11 Apr 2013 05:55:41 +0000 (22:55 -0700)]
Improve screenshot performance on some devices (DO NOT MERGE)
this affects devices that need a glReadPixels(). We use
a FBO instead of a GlConsumer as an intermediate render target, this
saves 2 calls to eglMakeCurrent().
On Galaxy Nexus this allows us to go from ~135ms to ~35ms for
recent's screenshots.
Bug:
8582615
Change-Id: I6b25291ecc235f1927579bbb2db3c731e985c6e8
Chet Haase [Thu, 11 Apr 2013 22:24:55 +0000 (15:24 -0700)]
DO NOT MERGE Make sure surfaces always have latest orientation info
When the screen is turned off, the current stack is set to -1. This causes
logic in iSurfaceFlinger's handleTransactionLocked() function to fail to
match the current stack, and the latest orientation is not set into the
layer. This causes BufferQueue, later, to potentially set an obsolete
transformHint on a created surface (such as in the case with ImageWallpaper's
Egl surface, in the bug below).
The fix is to note this situation and use a default value for the DisplayDevice,
which should have the current orientation information.
Issue #
8508397 ImageWallpaper sometimes rendered in wrong orientation causing a ~30-40% drop in graphics performance
Change-Id: Ibae15d73b289a8343c67f4f6bb77fdf11dd95ee7
Rom Lemarchand [Wed, 10 Apr 2013 23:59:36 +0000 (16:59 -0700)]
Add support for OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m color format
Change-Id: I9392eb961ec92d4d778573b7a142344e552c80d6
Andy McFadden [Thu, 11 Apr 2013 17:23:27 +0000 (10:23 -0700)]
am
12ff91b0: am
53dc9044: Merge "Updated comments" into jb-mr2-dev
* commit '
12ff91b05a055e6adffaad9bf7661a5d251c5b6c':
Updated comments
Andy McFadden [Thu, 11 Apr 2013 17:20:26 +0000 (10:20 -0700)]
am
53dc9044: Merge "Updated comments" into jb-mr2-dev
* commit '
53dc9044bfe17039592faf4660c5bf715e8120ad':
Updated comments
Andy McFadden [Thu, 11 Apr 2013 17:15:52 +0000 (17:15 +0000)]
Merge "Updated comments" into jb-mr2-dev
The Android Open Source Project [Thu, 11 Apr 2013 14:47:08 +0000 (07:47 -0700)]
am
6a92b35e: Reconcile with jb-mr2-release - do not merge
* commit '
6a92b35e3a64c90127fb87530c50e9a04a61c671':
The Android Open Source Project [Thu, 11 Apr 2013 14:45:13 +0000 (07:45 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If9501b8a4f0e4a1d6dc787c71457814360d11d2b
The Android Automerger [Thu, 11 Apr 2013 12:55:37 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev