Commit Graph

48556 Commits

Author SHA1 Message Date
jp abgrall
4b2b0a7494 am 74bd799e: Merge "Exit dumpstate on SIGPIPE to avoid cascading child crashes"
* commit '74bd799ec20d2420459fa382533b1cc39ca9a54c':
  Exit dumpstate on SIGPIPE to avoid cascading child crashes
2013-05-28 15:46:14 -07:00
Jeff Brown
31ab96fcc1 am 135e4dbd: Merge "utils: Allow non android namespaces to use ALOGD_IF_SLOW"
* commit '135e4dbd65d49730fbd6f830de7b303e01d20d5f':
  utils: Allow non android namespaces to use ALOGD_IF_SLOW
2013-05-28 15:46:03 -07:00
jp abgrall
74bd799ec2 Merge "Exit dumpstate on SIGPIPE to avoid cascading child crashes" 2013-05-28 21:18:59 +00:00
Jeff Brown
135e4dbd65 Merge "utils: Allow non android namespaces to use ALOGD_IF_SLOW" 2013-05-28 20:20:15 +00:00
John Michelau
885f888c55 Exit dumpstate on SIGPIPE to avoid cascading child crashes
When dumpstate ignores SIGPIPE it can lead to a cascade of tombstones /
coredumps since many of its children don't handle or ignore it.  It's
best to just exit dumpstate once the pipe is broken.

Change-Id: Ic0c57ecf4171f0c0a07837e51c41cb1876e1350c
2013-05-28 14:20:59 -05:00
The Android Open Source Project
f0e52b648b Reconcile with jb-mr2-release - do not merge
Change-Id: I400727c668eff57b5760595787d21dd021464587
2013-05-20 08:20:26 -07:00
The Android Automerger
3042131d29 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-19 05:55:29 -07:00
Mathias Agopian
2cad801d0d am 23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
* commit '23dacde4b624921df4f2c9646d20ca7acae357b6':
  [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
2013-05-17 13:53:31 -07:00
Mathias Agopian
23dacde4b6 [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
because surfaceflinger handles screenshot in a different
thread from the binder thread that requested it and because
the IGraphicBufferProducer is a synchronous interface
calling back into the system server; it is possible for
the latter to run out of binder threads (b/c it holds
a lock while calling into SF).

The solution is to make sure all calls on IGraphicBufferProducer
happen on the incoming binder thread. We achieve this by creating
a IGBP wrapper which is given to the screenshot code.

Bug: 8734824
Change-Id: Ife2441c7322e51ecfb20e0df03dacf6bce49578e
2013-05-17 13:20:53 -07:00
Mathias Agopian
e6eef6c136 am ea74d3b7: make the warning timout of Fence::waitForever() implicit and longer
* commit 'ea74d3b78d607cde17790a7bb83e6f68ffd34cfd':
  make the warning timout of Fence::waitForever() implicit and longer
2013-05-17 10:16:51 -07:00
Mathias Agopian
ea74d3b78d make the warning timout of Fence::waitForever() implicit and longer
- timeout is now 3 seconds instead of 1
- simplifies the API a bit
- allows us to change/tweak this timeout globaly

Bug: 8988871

Change-Id: I8d3c6ec43a372f602fb3f29856710339f86c0ec9
2013-05-16 18:15:57 -07:00
The Android Open Source Project
92cf355308 Reconcile with jb-mr2-release - do not merge
Change-Id: Ic457c583534afce9b1697b3b34221a729e2bc5b2
2013-05-16 05:43:41 -07:00
Jesse Hall
28fc78bf5f am e8fed71d: Merge "Abort surface composition if hw surface is invalid"
* commit 'e8fed71da2d3e03ef933d308520bab5b860f05aa':
  Abort surface composition if hw surface is invalid
2013-05-13 23:28:45 -07:00
Jesse Hall
e8fed71da2 Merge "Abort surface composition if hw surface is invalid" 2013-05-14 00:24:28 +00:00
Michael Chock
c8c7109619 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
2013-05-13 13:26:19 -07:00
Jesse Hall
7a48652874 am f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"
* commit 'f0dcff89acb998179757ca66b5c6a2c585a980e9':
  gl_code.cpp: Remove a DOS style newline
2013-05-13 13:05:36 -07:00
Jesse Hall
f0dcff89ac Merge "gl_code.cpp: Remove a DOS style newline" 2013-05-13 18:53:10 +00:00
The Android Automerger
60b1606061 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-13 05:55:40 -07:00
Eino-Ville Talvala
87ab83d96b 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
2013-05-09 10:15:17 -07:00
Eino-Ville Talvala
f743e3db27 Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev 2013-05-09 17:13:22 +00:00
The Android Automerger
5c469132e2 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-09 05:55:26 -07:00
Jesse Hall
dda4295221 am 64f3b2fd: Merge "Remove experimental HWC virtual display support" into jb-mr2-dev
* commit '64f3b2fd1ea9d30df6fd04ecdb086e540465bc18':
  Remove experimental HWC virtual display support
2013-05-08 13:57:56 -07:00
Jesse Hall
64f3b2fd1e Merge "Remove experimental HWC virtual display support" into jb-mr2-dev 2013-05-08 20:53:42 +00:00
The Android Automerger
91d768c9d9 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-08 05:55:32 -07:00
Jamie Gennis
d2a92b5b97 am db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev
* commit 'db733579a4c64eddd7dadb4ac15f54658ccfc0fb':
  atrace: add the 'dalvik' trace category
2013-05-07 18:23:18 -07:00
Jamie Gennis
db733579a4 Merge "atrace: add the 'dalvik' trace category" into jb-mr2-dev 2013-05-08 01:21:17 +00:00
Jeff Tinker
2c2283549c am b84d1cad: Correct native API documentation related to MediaDrm offline use case
* commit 'b84d1cad1d481f75aa03d55ac07e4ff58dbfb84a':
  Correct native API documentation related to MediaDrm offline use case
2013-05-07 17:20:56 -07:00
Jamie Gennis
eff2e8d237 atrace: add the 'dalvik' trace category
Bug: 8856374
Change-Id: Ie7759328333d21d8123ce9d4f1a177cae5ede51e
2013-05-07 15:20:57 -07:00
Jeff Tinker
b84d1cad1d 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
2013-05-07 15:16:40 -07:00
Jesse Hall
e737c11cd8 Remove experimental HWC virtual display support
Bug: 8384764
Change-Id: I97b52ed83ad85466bd91cb9291308994048568a1
2013-05-07 11:58:47 -07:00
The Android Automerger
96e4cb0203 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-07 05:55:26 -07:00
Eino-Ville Talvala
c43946b931 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
2013-05-06 17:24:05 -07:00
Dianne Hackborn
ba8e30a31d am 223b953c: Add Dalvik heap definition for 7" xhdpi devices.
* commit '223b953cf748d8197cba26545172db9dcaeea2b4':
  Add Dalvik heap definition for 7" xhdpi devices.
2013-05-06 15:21:02 -07:00
Dianne Hackborn
223b953cf7 Add Dalvik heap definition for 7" xhdpi devices.
Change-Id: I6a8e406ee98d3061d498bb2fbd1b97aa9e79b4b5
2013-05-06 15:06:20 -07:00
Marco Nelissen
3755dbec6f am 3d3cc6e1: Merge "Report actual disk space used" into jb-mr2-dev
* commit '3d3cc6e15ea6398105dc59d3135df3e64d5cf34e':
  Report actual disk space used
2013-05-06 11:11:38 -07:00
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
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
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
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
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