Mathias Agopian
63e4bba515
am 043a3cdd: Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
...
* commit '043a3cddf67e2baf38711bcb125084599f8f9802':
workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
2011-01-25 14:46:27 -08:00
Mathias Agopian
59f71e7feb
am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
...
* commit 'd3fcd0a1c923498921107bb44fbc8b24582a170a':
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
2011-01-25 14:46:22 -08:00
Mathias Agopian
01749e731c
Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
2011-01-25 14:43:21 -08:00
Mathias Agopian
e3f0ec9f87
Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
2011-01-25 14:43:14 -08:00
Mathias Agopian
2462602edf
Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
2011-01-25 14:43:09 -08:00
Mathias Agopian
78bd4f68a9
Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
2011-01-25 14:43:05 -08:00
Mathias Agopian
9bfe965ae7
Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
2011-01-25 14:42:59 -08:00
Jeff Hamilton
a18edb2a76
am f126ad3b: Merge "Use classnames instead of ints for NFC techs." into gingerbread
...
* commit 'f126ad3b6484ef62eed202f1f49cc4557c0a3848':
Use classnames instead of ints for NFC techs.
2011-01-25 14:41:55 -08:00
Jeff Hamilton
d69b1cc4b1
Merge "Use classnames instead of ints for NFC techs." into gingerbread
2011-01-25 14:35:46 -08:00
Mathias Agopian
d1a99ec6b2
fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
...
Generally we never want to lock a buffer for write access if it is at
the "head" on the surfaceflinger side. The only exception (1) is when
the buffer is not currently in use AND there is at least one queued
buffer -- in which case, SurfaceFlinger will never use said buffer
anymore, because on the next composition around, it will be able to
retire the first queued buffer.
The logic above relies on SurfaceFlinger always retiring
and locking a buffer before composition -- unfortunately this
didn't happen during a screenshot.
This could leave us in a situation where a buffer is locked by the
application for write, and used by SurfaceFlinger for texturing,
causing a hang.
Here, we fix this issue by never assuming the exception (1), it was
intended as an optimization allowing ANativeWindow::lockBuffer() to
return sooner and was justified when most of SF composition was
done in software. The actual buffer locking is now ensured by
gralloc. We could have handled screenshots in a similar way to
a regular composition, but it could have caused glitches on screen,
essentially, taking a screenshot could cause to skip a frame.
now that we removed the notion of a "inUse" buffer in surfaceflinger
a lot of code can be simplified / removed.
noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete"
is also gone.
2011-01-25 14:19:13 -08:00
Mathias Agopian
53a67e1663
partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
...
We used to guarantee that a layer in SurfaceFlinger would never be
destroyed before all references (to its ISurface) on the client
side would be released. At some point, this guarantee got
relaxed to allow to free gralloc resources sooner. This last
change was incorrect, because:
- in implementations with reference-counting the gralloc resources
wouldn't be released anyways, until all the mapping were gone
- in implementations without ref counting, the client side
would most likely crash or do something bad
- it also caused the SharedBufferStack slot to be reallocated
to another surface, which could be problematic if the client
continued to use the surface after the window manager destroyed it.
So, we essentially reinstate the guarantee that layers won't be
destroyed until after all references to their ISurface are
released.
NOTE: This doesn't entirely fix 3306150 because there is another
problem there where the Browser continues to use a surface after it
has been destroyed.
also improve SurfaceFlinger 'dumpsys' log
list the purgatory, which shows windows that have been closed,
but for which the client still has references.
2011-01-25 14:19:13 -08:00
Mathias Agopian
cfb676f1ae
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
...
we were not clearing the screen entirely, which caused garbage when
the screen wasn't entirely covered by windows.
Change-Id: Ia7aa13c36a8a314e0e8427d419b16b9aa2165ddf
2011-01-25 14:18:58 -08:00
Mathias Agopian
5dc7e7da92
workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
...
we make sure to call compositionComplete after everytime we do
composition with the GPU (even for the screenshot case), which is
where the buffer locks are released.
Change-Id: I450430d1e4d1ee9ce1023970642378c42cdcfa4c
2011-01-25 14:18:29 -08:00
Mathias Agopian
a0c6b76173
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
...
Change-Id: I1ddbbbec4fa5b2521ef3787bc28efe1bc90d0060
2011-01-25 14:18:15 -08:00
Marco Nelissen
e1ea1e3e74
am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
...
* commit 'c929677e017759047d94599faa1b80ebe278fefb':
Increase the number of useful bits in the spectrum.
2011-01-25 10:11:09 -08:00
Marco Nelissen
802c092a8a
Merge "Increase the number of useful bits in the spectrum." into gingerbread
2011-01-25 10:06:16 -08:00
Nick Pelly
9324dbe4f3
am b134223f: Make Mifare Classic increment/decrement operands little endian
...
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
Make Mifare Classic increment/decrement operands little endian
2011-01-25 08:41:35 -08:00
Hung-ying Tyan
09a992c120
am cc019c0c: Merge "Get mute state from active call." into gingerbread
...
* commit 'cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
Get mute state from active call.
2011-01-24 21:46:23 -08:00
Hung-ying Tyan
ec889c108b
Merge "Get mute state from active call." into gingerbread
2011-01-24 21:13:08 -08:00
Hung-ying Tyan
b86e30706a
am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
...
* commit '14b6d0620b42d1bb3a55778ba452d838a0d89223':
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.
2011-01-24 19:44:56 -08:00
Hung-ying Tyan
c9af508cb2
Merge changes Ib70e0cf2,I0691cd70 into gingerbread
...
* changes:
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.
2011-01-24 19:41:42 -08:00
Jeff Brown
233cb27f98
am d8bdc06f: Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
...
* commit 'd8bdc06f8139231f1edc1a8bf22b637ebb790605':
Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
2011-01-24 17:38:32 -08:00
Andreas Huber
6b7fbfdb29
am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
...
* commit 'efebdf4bd4da35bc50c7d81450c8473697f6654a':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
2011-01-24 16:30:12 -08:00
Brad Fitzpatrick
5c10422684
am 996de2dd: Merge "Avoid using String.format in MediaRecorder"
...
* commit '996de2dd41498a48be6821cfa0a81b16c0b3975c':
Avoid using String.format in MediaRecorder
2011-01-24 14:03:48 -08:00
Brad Fitzpatrick
43c79a0317
Merge "Avoid using String.format in MediaRecorder"
2011-01-24 13:36:15 -08:00
Justin Ho
420a3660b0
am 28c4f69a: Updated checkbox assets
...
* commit '28c4f69a938766076c14e8f5b07951ec2a9f610d':
Updated checkbox assets
2011-01-24 13:08:54 -08:00
Arnaud Ferir
ac9b340ff7
am 5e81a6e2: Fix trace mismatch.
...
* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
Fix trace mismatch.
2011-01-24 10:49:40 -08:00
Sylvain Fonteneau
32ca480fc1
am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
...
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-24 10:49:36 -08:00
John Wang
0c3416139b
am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
...
* commit '93300ce2d398195d5616a2e924eb4a785274538e':
Enable recovery in RIL wakelock release check.
2011-01-24 09:26:56 -08:00
John Wang
c5da08b788
Merge "Enable recovery in RIL wakelock release check." into gingerbread
2011-01-24 09:14:14 -08:00
Nick Pelly
817c3a60c3
am c896d85c: Merge "Add operands to mifare classic increment, decrement." into gingerbread
...
* commit 'c896d85c15d8a6c98c93df57d88481b89eb878f5':
Add operands to mifare classic increment, decrement.
2011-01-23 22:14:54 -08:00
Nick Pelly
c6547f4f92
Merge "Add operands to mifare classic increment, decrement." into gingerbread
2011-01-23 22:12:25 -08:00
Nick Pelly
e94ab5ebf8
am da01b4ab: Merge "Make MifareClassic methods more consistent." into gingerbread
...
* commit 'da01b4abb817fcebdf33c27aaa6a1ac4a61beee0':
Make MifareClassic methods more consistent.
2011-01-23 21:39:39 -08:00
Nick Pelly
5bb6faa957
Merge "Make MifareClassic methods more consistent." into gingerbread
2011-01-23 21:36:14 -08:00
Jeff Hamilton
68c9cf7818
am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
...
* commit 'e1e70c57613956dff0f14829f6385e26c323b609':
Allow null filters for foreground dispatch to act as catch all.
2011-01-23 19:28:17 -08:00
Jeff Hamilton
bbb02bc7e4
Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
2011-01-23 19:17:22 -08:00
Jim Miller
256f41e458
am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.
...
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
Fix 3379239: Catch exceptions from workaround for OOM.
2011-01-23 14:30:07 -08:00
Dianne Hackborn
5de960a98a
am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"
...
* commit 'bcf2adeb10c41becec3baa2bcb8de9212272399a':
aapt: Allow raw "%" in unformatted string-arrays
2011-01-23 12:57:33 -08:00
Dianne Hackborn
5ab218b1d3
Merge "aapt: Allow raw "%" in unformatted string-arrays"
2011-01-23 12:44:13 -08:00
Jeff Brown
d1de37fdab
am 265cf2e7: Merge "Fix getSwitchState."
...
* commit '265cf2e76bef9ee369a7d43d567a22a0c39355ef':
Fix getSwitchState.
2011-01-22 21:32:58 -08:00
Jeff Brown
f079d0d3f9
Merge "Fix getSwitchState."
2011-01-22 21:23:19 -08:00
Dianne Hackborn
295a583376
am 35f4d32d: Merge "frameworks/base: Track owner in appropriate owners list of Uri"
...
* commit '35f4d32dc2f0c383323e780ecc7e2764704c5d2c':
frameworks/base: Track owner in appropriate owners list of Uri
2011-01-22 11:50:41 -08:00
Dianne Hackborn
c315da09e8
Merge "frameworks/base: Track owner in appropriate owners list of Uri"
2011-01-22 11:26:05 -08:00
Jaikumar Ganesh
4636e722b5
am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
...
* commit '1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
Do Not Merge Connect other profiles when priority is auto connect.
2011-01-21 21:36:32 -08:00
Jaikumar Ganesh
a43fd13a6e
Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
2011-01-21 21:25:01 -08:00
John Reck
236098576a
am 398a589c: Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
...
* commit '398a589ccea744556732b25097412dbb22c51271':
DO NOT MERGE - Create db path if it doesn't exit
2011-01-21 14:06:08 -08:00
John Reck
59141d09f5
Merge "DO NOT MERGE - Create db path if it doesn't exit" into gingerbread
2011-01-21 14:03:30 -08:00
Jeff Hamilton
2a0ba6a3fc
am dc54a8c7: Merge "API changes for NFC." into gingerbread
...
* commit 'dc54a8c742e96d6ea8ef3e18c0f2ee1235899599':
API changes for NFC.
2011-01-21 12:33:55 -08:00
Jeff Hamilton
86d7998cf7
Merge "API changes for NFC." into gingerbread
2011-01-21 11:34:20 -08:00
Dianne Hackborn
a5ba0d9ffa
am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page."
...
* commit 'a8069f34f65bee858d87fd232a872a62e85a502b':
Fixes Keyboard availability in "Providing Resources" documentation page.
2011-01-21 09:55:16 -08:00