Scott Main
e000729397
Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final" into gingerbread
2011-01-27 13:25:10 -08:00
Nick Pelly
07a30ef34b
Merge "Clean up MifareUltralight API." into gingerbread
2011-01-27 12:23:53 -08:00
Robert Greenwalt
27abf0566b
am 89a54408: Merge "Update networktype before sending state change." into gingerbread
...
* commit '89a544088fcfa849be0d8824a2ac0a545950847b':
Update networktype before sending state change.
2011-01-27 10:20:33 -08:00
Robert Greenwalt
08f897d2b3
Merge "Update networktype before sending state change." into gingerbread
2011-01-27 10:17:33 -08:00
Dirk Dougherty
d6684a41c0
am 591a5f86: Doc change: fix adt archive filename.
...
* commit '591a5f86bd4b3f1732b935daad909e4e63149f01':
Doc change: fix adt archive filename.
2011-01-27 10:08:09 -08:00
Scott Main
70b372b82c
am ba3dd323: enable preview mode for docs and add api level 10 flag for api level diffs
...
* commit 'ba3dd32357b47ab0b55a1976bbafc225df78a59d':
enable preview mode for docs and add api level 10 flag for api level diffs
2011-01-26 18:37:22 -08:00
Scott Main
b219a84d85
am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
...
* commit 'a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
2011-01-26 17:56:26 -08:00
Scott Main
e0f78c41aa
Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
2011-01-26 17:52:08 -08:00
Andreas Huber
ee835990df
am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
...
* commit '2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-26 16:40:04 -08:00
Jeff Brown
dfba4b46ec
am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
...
* commit '7b448b8a6c1ababc3a3e4553ebe9bac7473051c8':
Move keymaps from sdk/emulator/keymaps.
2011-01-26 15:03:32 -08:00
Jeff Brown
e8fecc4f7f
Merge "Move keymaps from sdk/emulator/keymaps."
2011-01-26 14:25:08 -08:00
Dianne Hackborn
e0ee64bbeb
am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
...
* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:08:30 -08:00
Jean-Michel Trivi
abf02a95a0
am 2ba92c71: do not merge bug 3370834 Cherrypick from master
...
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug 3370834 Cherrypick from master
2011-01-26 14:05:18 -08:00
Dianne Hackborn
afb1ae6448
Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
2011-01-26 13:59:42 -08:00
Kenny Root
73fa8add77
am 138757db: Merge "Make OBB results a one-way call" into gingerbread
...
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
Make OBB results a one-way call
2011-01-26 09:25:43 -08:00
Kenny Root
30acaa8851
Merge "Make OBB results a one-way call" into gingerbread
2011-01-26 09:17:28 -08:00
Ritu Srivastava
5ee1a0c5ee
fix failing thread object run
...
A previously exited Thread object refuses to run again, if the
thread-id of the caller, conincides with the thread-id it previously
used in the worker thread. Hence reset the previously used worker
thread-id to -1 when it exits.
Signed-off-by: Ritu Srivastava <rsrivast@sta.samsung.com>
Change-Id: I873925c312a43ec8a16392b98cc959042ff6bfd2
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
2011-01-25 21:48:54 -08:00
Jeff Hamilton
f207453940
am c33acae9: Merge "Fix the build, proper current.xml." into gingerbread
...
* commit 'c33acae9060162c5d2c28613b71c3bb1e0ef4c1c':
Fix the build, proper current.xml.
2011-01-25 16:15:58 -08:00
Jeff Hamilton
1b9429f227
Merge "Fix the build, proper current.xml." into gingerbread
2011-01-25 16:11:37 -08:00
Brad Fitzpatrick
9c392af270
am a206efcf: Merge "android.os.Message: respect sPoolSize"
...
* commit 'a206efcf8d2e56cbd0d1de125b29b45fc6cc8431':
android.os.Message: respect sPoolSize
2011-01-25 15:44:33 -08:00
Brad Fitzpatrick
fed2f18022
Merge "android.os.Message: respect sPoolSize"
2011-01-25 15:12:18 -08:00
Mathias Agopian
275e627ef6
am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
...
* commit '239fd805ef7c0e4116b0a89e20caaf287e91f017':
fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
2011-01-25 14:46:40 -08:00
Mathias Agopian
c92ba8851e
am 1955a5c9: Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
...
* commit '1955a5c9da421dc89bb1a1dd3d3193159192cde9':
partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
2011-01-25 14:46:35 -08:00
Mathias Agopian
f7701fabe8
am d0441f92: Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
...
* commit 'd0441f921b2b1879fb44041f521d9bfaa5a547d0':
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
2011-01-25 14:46:31 -08:00
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