Commit Graph

47853 Commits

Author SHA1 Message Date
Jesse Hall
d24276d399 Merge "Create builtin display tokens on demand" 2012-11-12 09:58:12 -08:00
Andy McFadden
2bdd8fd65a am 41f7736a: am 434e21bf: am 3fdeb48e: Reduce emulator logspam
* commit '41f7736ad1e72df8796416a82ce3cede6193d1eb':
  Reduce emulator logspam
2012-11-09 22:49:18 -08:00
Andy McFadden
41f7736ad1 am 434e21bf: am 3fdeb48e: Reduce emulator logspam
* commit '434e21bfd6b14f8d99b9bcdb829e7252edd574f3':
  Reduce emulator logspam
2012-11-09 22:45:13 -08:00
Andy McFadden
434e21bfd6 am 3fdeb48e: Reduce emulator logspam
* commit '3fdeb48e3c89be15fe3b539a26ec9a3cf28c898c':
  Reduce emulator logspam
2012-11-09 22:41:48 -08:00
Jesse Hall
692c723e84 Create builtin display tokens on demand
For hotpluggable builtin displays (currently just HDMI), create the
display device IBinder token when the display is connected and destroy
it when the display is disconnected. Previously we created the tokens
at startup and never changed them. This made it so that when comparing
current and drawing state, we couldn't tell whether a display had been
disconnected and reconnected.

Bug: 7491120
Change-Id: I23b77037dc0f548d549abf580339edd0e3c626e9
2012-11-09 11:48:25 -08:00
Andy McFadden
3fdeb48e3c Reduce emulator logspam
The emulator doesn't support systrace, but we should point that out
at most once per process.

Bug 7436352

Change-Id: I06b2c1ea0df6c02c11cd2496423c337f8d7c62a1
2012-11-08 16:40:11 -08:00
Dmitry Shmidt
258fe7eac9 am 77622879: am 4bacaec4: am 0b2c9268: bugreport: Add /proc/interrupts dump
* commit '77622879a6a12c6cb916df46c919dde87656e6df':
  bugreport: Add /proc/interrupts dump
2012-11-08 15:59:28 -08:00
Dmitry Shmidt
03d0600ea7 am af9e8a59: am 61db92e7: am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd
* commit 'af9e8a59619ec6050739dd68ea108cc7e182d059':
  bugreport: Add wlan FW counters dump for bcmdhd
2012-11-08 15:59:27 -08:00
Dmitry Shmidt
77622879a6 am 4bacaec4: am 0b2c9268: bugreport: Add /proc/interrupts dump
* commit '4bacaec4cd5844d67bfa4659393cb7e7fe343d1e':
  bugreport: Add /proc/interrupts dump
2012-11-08 15:43:05 -08:00
Dmitry Shmidt
af9e8a5961 am 61db92e7: am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd
* commit '61db92e72771a42456a3b703f275c4a4e1f8b552':
  bugreport: Add wlan FW counters dump for bcmdhd
2012-11-08 15:43:04 -08:00
Dmitry Shmidt
4bacaec4cd am 0b2c9268: bugreport: Add /proc/interrupts dump
* commit '0b2c9268265e9a165551eaa66cb461d3fab8b564':
  bugreport: Add /proc/interrupts dump
2012-11-07 14:37:14 -08:00
Dmitry Shmidt
61db92e727 am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd
* commit 'c11f56e5615c5d388c072705322df5bcf22c2012':
  bugreport: Add wlan FW counters dump for bcmdhd
2012-11-07 14:37:11 -08:00
Colin Cross
1493a3974a dumpstate: fix incorrectly zeroed array
Change-Id: I55a916568baf66629b02a6d80fce34b84ffb3a34
2012-11-07 11:25:31 -08:00
Dmitry Shmidt
0b2c926826 bugreport: Add /proc/interrupts dump
Bug: 7301178

Change-Id: Ifad3b981ac904d4637d69dfc223d5bb2c9d80bda
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-11-07 11:09:46 -08:00
Dmitry Shmidt
c11f56e561 bugreport: Add wlan FW counters dump for bcmdhd
Bug: 7494877

Change-Id: I4d24dbcf7596777ec02ab1312c2ab996ba7688f1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-11-07 10:42:05 -08:00
Ben Cheng
20b9749959 Disable ld --fatal-warnings because of using mktemp.
Change-Id: Id18b1e38672294b025bc26adb38aed0ac3e0fb45
2012-11-06 23:11:35 -08:00
Andrew Hsieh
16ac25b73a am 168dfe71: am 5e530e02: am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
* commit '168dfe71bfafebaa26b6f75df553f5fad7607669':
  Fix return type of glGetAttribLocation and glGetUniformLocation
2012-11-06 20:46:17 -08:00
Andrew Hsieh
168dfe71bf am 5e530e02: am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
* commit '5e530e02bc3073a2e2469df3c333ae14f1b37433':
  Fix return type of glGetAttribLocation and glGetUniformLocation
2012-11-06 20:43:06 -08:00
Andrew Hsieh
5e530e02bc am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
* commit 'a151a19db2fa07295837027fb5d84c02401cc78d':
  Fix return type of glGetAttribLocation and glGetUniformLocation
2012-11-06 20:41:34 -08:00
Andrew Hsieh
a151a19db2 Merge "Fix return type of glGetAttribLocation and glGetUniformLocation" 2012-11-06 20:16:14 -08:00
Andrew Hsieh
300ad09822 Fix return type of glGetAttribLocation and glGetUniformLocation
from int to GLint.

See:
   http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetAttribLocation.xml
   http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetUniformLocation.xml

Change-Id: I4a9f8e9e34b8c3cca239ae84bfe8f3cdfd94802a
2012-11-06 14:39:08 -08:00
The Android Open Source Project
8f3bc0c944 am c2e5b273: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'c2e5b273c43e3d1649c5f8cecb47c7d84afb6f6e':
2012-11-06 12:40:10 -08:00
The Android Open Source Project
c2e5b273c4 Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ic4f86f5a85ccb35cb054ba6294756456cde4b493
2012-11-06 12:37:30 -08:00
The Android Open Source Project
2bd3f3dca1 am 1509a46a: (-s ours) am 20152ac7: am d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '1509a46a860060f7630c5c58d7d08695f7350dc2':
2012-11-06 12:29:10 -08:00
The Android Open Source Project
1509a46a86 am 20152ac7: am d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '20152ac797ab3a26561eb23ce672137c9e24ac8c':
2012-11-06 12:24:34 -08:00
The Android Open Source Project
20152ac797 am d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'd8e8e66220cd71486a3b545096a1cdc298dee5fd':
  partially implement external display clipping
  Always set vertex alpha when drawing screenshot layers
  SurfaceFlinger: add animation transactions
  ugly, temporary, workaroung for a problem where a binder thread spins forever
  make sure we don't call into the HWC HAL when not needed
  Fix crashes after HDMI disconnect
  Fix issue #7271589: Cannot set Ocean HD live wallpaper
  Revert "Compatibility work around for bad graphics driver dependency."
  only abort when errors happen on the main display
  Check that HWC exists before trying to use it
  Always reset layer acquireFenceFd after commit
  fix a problem where  all hwc layers would have the SKIP flags set
  we were sometimes not setting fences properly
  A vendor ril depends on a native screen shot code.
  Revert "Added display initialization method"
  fix various issues in SF's EventThread
  Revert "SurfaceTexture: inherit from ConsumerBase"
  we were mistakenly optimizing out SF's main transactions in some cases
  Revert "Minimal changes to support multi-display HWC"
2012-11-06 12:20:29 -08:00
The Android Open Source Project
d8e8e66220 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I219247f1b0f5d87b4144dc1535039e93fc636a94
2012-11-06 12:17:20 -08:00
The Android Automerger
42118c7795 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-06 02:25:46 -08:00
The Android Automerger
f67623632a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-05 18:38:55 -08:00
Mathias Agopian
2788a3526d am 731e0331: am e70fbe8b: am 02b95105: fix transitions from hwc to GLES composition
* commit '731e0331eb402ec4564b69eaeb8b605a8b800b1b':
  fix transitions from hwc to GLES composition
2012-11-05 18:19:53 -08:00
Mathias Agopian
731e0331eb am e70fbe8b: am 02b95105: fix transitions from hwc to GLES composition
* commit 'e70fbe8b32687d9178e828d6023de599be5431c3':
  fix transitions from hwc to GLES composition
2012-11-05 18:17:18 -08:00
Mathias Agopian
e70fbe8b32 am 02b95105: fix transitions from hwc to GLES composition
* commit '02b95105754b1859a97e234b79f41489a4677c20':
  fix transitions from hwc to GLES composition
2012-11-05 18:15:56 -08:00
Mathias Agopian
02b9510575 fix transitions from hwc to GLES composition
If we switched from HWC to GLES but the dirty region was empty
(could happen if the dirty region is outside of the screen for instance), we
need to force a full screen composition.

In this change we ignore the dirty region for the purpose of
rejecting the whole update and we rely on the fact that it will later
be expanded to the whole screen. This was the least risky fix.

Bug: 7467760, 7452931
Change-Id: I2132f2f963b00a3ce7150adadb107b0367b3862e
2012-11-05 17:50:57 -08:00
Igor Murashkin
74284b9467 Merge "Change ConsumerBase's FrameAvailableListener to be a weak pointer" 2012-11-05 13:47:37 -08:00
Igor Murashkin
a4a3149a36 Change ConsumerBase's FrameAvailableListener to be a weak pointer
This prevents strong reference cycles when the listener implementation also
holds a strong pointer to the ConsumerBase

Bug: 7425644
Change-Id: I1514b13a32b18d421c902dddebec0765a989c55c
2012-11-05 13:39:02 -08:00
Colin Cross
5f7e348746 Merge "dumpstate: dump all threads in show_wchan" 2012-11-03 10:18:49 -07:00
Colin Cross
0c22e8b316 dumpstate: dump all threads in show_wchan
for_each_pid only finds processes and not their threads.  Add
for_each_tid and call it for show_wchan so we can see where all
threads are blocked in the kernel.

Change-Id: Iffb59f7c2933cecf51cdd358a36e19932c2f24c7
2012-11-02 23:57:43 -07:00
Jeff Brown
f3f7db6346 Allow global transactions to nest.
This change fixes a number of small glitches that can occur when
multiple components in the same process are updating surfaces.
One would expect that updates to disjoint sets of surfaces would
not collide but this is not the case.  The first component to
close the global transaction causes all pending updates to
be applied, including those that another component might not
have finished setting up if it also had an open transaction
at the same time.

Change-Id: I99345958581abbe0e1e325a5bcba37e8941a313a
2012-11-02 14:02:52 -07:00
Jason Simmons
7e25127388 Ensure that Vector::erase() returns a valid iterator
Vector::erase may reallocate the Vector's storage while removing an element.
However, erase() calls begin() before calling removeItemsAt(), thus caching
a pointer the the Vector's old storage.  If the storage is reallocated,
the iterator returned by erase() will be based on the old storage pointer
and will thus be invalid.

Bug: 7433283

Change-Id: I91980e0fcb5a2e0a55f1a78444a5958037afdbed
2012-11-01 16:33:50 -07:00
Mathias Agopian
446ba53792 Merge "rework a bit how we scissor the display" 2012-11-01 16:32:02 -07:00
Mathias Agopian
766dc49c17 rework a bit how we scissor the display
the scissor rect is now computed once by DisplayDevice
and is combined with the "undefined" region so that
the letter-boxed area of the screen get cleared in
drawWormhole.

Bug: 7149437
Change-Id: Id2f30516a5786f32eace7f876ff32028f954f357
2012-10-31 14:22:51 -07:00
The Android Open Source Project
89311db9e2 am e2d4cc28: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'e2d4cc28d72db0d49e61ed4ceeb878436cafb23a':
  partially implement external display clipping
  Always set vertex alpha when drawing screenshot layers
  SurfaceFlinger: add animation transactions
2012-10-31 09:22:29 -07:00
The Android Open Source Project
e2d4cc28d7 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I4f96bf28f6585ad8331daeab60e6d23e92cf0c5d
2012-10-31 09:16:58 -07:00
Colin Cross
13990bb4ca am 5b47c5c5: am 742801c6: am 2281af96: dumpstate: add kernel memory fragmentation unusable index
* commit '5b47c5c574d8d3bf8e73ea4fd7a08e0d881d461c':
  dumpstate: add kernel memory fragmentation unusable index
2012-10-30 10:11:27 -07:00
The Android Automerger
f9218b8591 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 08:52:44 -07:00
Colin Cross
5b47c5c574 am 742801c6: am 2281af96: dumpstate: add kernel memory fragmentation unusable index
* commit '742801c625ecb09fbe14e717fa5d580b3957ed4a':
  dumpstate: add kernel memory fragmentation unusable index
2012-10-29 17:10:16 -07:00
Colin Cross
742801c625 am 2281af96: dumpstate: add kernel memory fragmentation unusable index
* commit '2281af967dd840aade7bc55b19ea7df0e6da36f2':
  dumpstate: add kernel memory fragmentation unusable index
2012-10-29 17:08:14 -07:00
Raph Levien
3bc7b27571 Merge "Add an LRU cache plus hashing primitives" 2012-10-29 08:59:54 -07:00
Colin Cross
2281af967d dumpstate: add kernel memory fragmentation unusable index
Dump /d/extfrag/unusable_index in bugreports.  It shows the
percentage of memory in each zone that is not available for
allocations for each order.

Change-Id: I2af6680cb609887ea7b3d6107d1aa88bd0206b52
2012-10-28 22:41:06 -07:00
Raph Levien
8185e47822 Add an LRU cache plus hashing primitives
This patch adds a hashtable-based LRU cache. This should be
significantly higher performance than the GenerationCache it is intended
to replace. It is a large part of the fix for bug 7271109
TextLayoutCache low-level performance issues.

We added a new method to BasicHashtable to detect when rehashing is
needed, because the internal linked list pointers would get invalidated
by that rehashing.

Also, the hash_type specialized to pointers had a small flaw.

Change-Id: I950c2083f96519777b851dbe157100e0a334caec
2012-10-26 16:09:22 -07:00