OSDN Git Service
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:26:18 +0000 (16:26 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:19:59 +0000 (16:19 -0800)]
am
e88fa50b: Merge from open-source gingerbread
* commit '
e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
fix failing thread object run
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:07:25 +0000 (16:07 -0800)]
am
25503f1c: Merge from gingerbread
* commit '
25503f1c9f0b5f718052b71dc5b21d1c8576d015':
fix failing thread object run
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:35:06 +0000 (15:35 -0800)]
Merge from gingerbread
Change-Id: I017330e0232b317b8bb54e19ab05874b18c83246
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:29:52 +0000 (15:29 -0800)]
Merge from open-source gingerbread
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:17:33 +0000 (15:17 -0800)]
Merge "fix failing thread object run" into gingerbread
Dianne Hackborn [Sun, 30 Jan 2011 07:04:50 +0000 (23:04 -0800)]
am
a30063d8: am
25eb0464: Merge "Normalize output from aapt d"
* commit '
a30063d80c08434ac3c7316f338c6d54110449ab':
Normalize output from aapt d
Dianne Hackborn [Sun, 30 Jan 2011 07:01:20 +0000 (23:01 -0800)]
am
25eb0464: Merge "Normalize output from aapt d"
* commit '
25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
Normalize output from aapt d
Dianne Hackborn [Sun, 30 Jan 2011 06:53:20 +0000 (22:53 -0800)]
Merge "Normalize output from aapt d"
Dianne Hackborn [Sun, 30 Jan 2011 06:30:57 +0000 (22:30 -0800)]
am
c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
* commit '
c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
DO NOT MERGE: Fix screen size compatibility mode.
Dianne Hackborn [Sun, 30 Jan 2011 06:20:05 +0000 (22:20 -0800)]
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
Dianne Hackborn [Sat, 29 Jan 2011 21:22:02 +0000 (13:22 -0800)]
DO NOT MERGE: Fix screen size compatibility mode.
Cherry-picked from HC.
Change-Id: Icce2a64f187a56deefcddc3d9b22fa94effce431
Dianne Hackborn [Sat, 29 Jan 2011 23:05:30 +0000 (15:05 -0800)]
am
2107757d: am
bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit '
2107757dde0b3159119edcc9084fcb9a87985e88':
Make AaptGroupEntry::getMncName accept mnc00
Dianne Hackborn [Sat, 29 Jan 2011 22:59:02 +0000 (14:59 -0800)]
am
bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit '
bbb5a5ce1922a168335811b177cd7341350c15cc':
Make AaptGroupEntry::getMncName accept mnc00
Jean-Baptiste Queru [Sat, 29 Jan 2011 22:43:33 +0000 (14:43 -0800)]
am
1358b6a4: Tweak to make merges easier
* commit '
1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
Dianne Hackborn [Sat, 29 Jan 2011 22:38:48 +0000 (14:38 -0800)]
Merge "Make AaptGroupEntry::getMncName accept mnc00"
Jean-Baptiste Queru [Sat, 29 Jan 2011 20:53:52 +0000 (12:53 -0800)]
Tweak to make merges easier
Bug:
3364311
Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
Jean-Baptiste Queru [Sat, 29 Jan 2011 16:00:52 +0000 (08:00 -0800)]
am
87d19759: Delete browerplugin tests - do not merge
* commit '
87d197597c9130b10ba9d67f17ed81db26e35cd8':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:58:36 +0000 (07:58 -0800)]
am
d4c8cec0: am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
d4c8cec094dbf7bcfa3f31bedae15e5c65b13e94':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:36:31 +0000 (13:36 -0800)]
Delete browerplugin tests - do not merge
Those don't build in all environments.
Change-Id: Ie564d464d2745df0114236f2c28aa1254d0f65b5
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:39:47 +0000 (07:39 -0800)]
am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
9720323a5138acafbe30da38d61eeac469b675a4':
Delete browerplugin tests - do not merge
Robert Greenwalt [Sat, 29 Jan 2011 14:55:38 +0000 (06:55 -0800)]
am
6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
* commit '
6b739dc7292452227cdd8abd90658f4db8f0ce70':
Add some network types that OEM's are asking for.
Robert Greenwalt [Sat, 29 Jan 2011 14:38:35 +0000 (06:38 -0800)]
Merge "Add some network types that OEM's are asking for." into gingerbread
Jean-Baptiste Queru [Fri, 28 Jan 2011 23:26:59 +0000 (15:26 -0800)]
Merge "Delete browerplugin tests - do not merge"
Robert Greenwalt [Fri, 28 Jan 2011 22:48:37 +0000 (14:48 -0800)]
Add some network types that OEM's are asking for.
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values. Will mark them unhidden in a future sdk release.
bug:
3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
Eric Fischer [Fri, 28 Jan 2011 22:19:36 +0000 (14:19 -0800)]
am
5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
5f2def8cfdad2491a646be69347444a3be6ddf84':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 22:10:43 +0000 (14:10 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 28 Jan 2011 21:16:00 +0000 (13:16 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Id8afb303d2ecfc6270d1af1abd189c0ef0bf2314
Dirk Dougherty [Fri, 28 Jan 2011 20:00:51 +0000 (12:00 -0800)]
am
fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit '
fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
Doc change: Add time-lapse video to 3.0 highlights.
Dirk Dougherty [Fri, 28 Jan 2011 19:57:42 +0000 (11:57 -0800)]
Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
Andreas Huber [Fri, 28 Jan 2011 18:42:10 +0000 (10:42 -0800)]
am
b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
* commit '
b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Andreas Huber [Fri, 28 Jan 2011 17:19:12 +0000 (09:19 -0800)]
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Change-Id: If5a00f1e29dbc12956e1fb000dac859706d19791
related-to-bug:
3217210
Eric Laurent [Fri, 28 Jan 2011 02:40:42 +0000 (18:40 -0800)]
am
0ef57993: Merge "Fix issue
2988031." into gingerbread
* commit '
0ef579939e6c96fcd2b42b164c5debf535a6a53b':
Fix issue
2988031.
Eric Laurent [Fri, 28 Jan 2011 02:37:04 +0000 (18:37 -0800)]
Merge "Fix issue
2988031." into gingerbread
Jim Miller [Fri, 28 Jan 2011 02:25:12 +0000 (18:25 -0800)]
am
226e5756: Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
* commit '
226e57563c3110aa688fc41f10b7a96cd21b6231':
Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
Jim Miller [Fri, 28 Jan 2011 02:22:14 +0000 (18:22 -0800)]
Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
Jim Miller [Wed, 26 Jan 2011 01:46:47 +0000 (17:46 -0800)]
Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
Some devices that use LiPo batteries do not charge them to 100%
as a safety margin and to preserve battery longevity. This change
allows KeyguardUpdateMonitor to determine when the battery state should be
reported as "Charged", provided the device sets BATTERY_STATUS_FULL in
that case.
Change-Id: Iac6cb78e24f9a696017459cc773c38ef7fe7779f
Dirk Dougherty [Fri, 28 Jan 2011 01:55:35 +0000 (17:55 -0800)]
Doc change: Add time-lapse video to 3.0 highlights.
Change-Id: I5fb9cb76a544a502cd2f67bc1902b2c02a2a52a8
Nick Pelly [Fri, 28 Jan 2011 00:26:28 +0000 (16:26 -0800)]
am
d350dc04: Merge "API: Make close() throw an IOException." into gingerbread
* commit '
d350dc0492fab3614749955f5dcf21ec1c522b24':
API: Make close() throw an IOException.
Nick Pelly [Fri, 28 Jan 2011 00:23:35 +0000 (16:23 -0800)]
Merge "API: Make close() throw an IOException." into gingerbread
Nick Pelly [Thu, 27 Jan 2011 22:47:02 +0000 (14:47 -0800)]
API: Make close() throw an IOException.
IOException on close() can be useful to indicate that in-progress transactions
were canceled.
I also audited all of our tech classes to make sure every function that needs
to throw IOException does so.
Change-Id: Iaa9c43d79d59ff85772d5c3e4b4d57a6fa8df4cf
Eric Fischer [Thu, 27 Jan 2011 23:00:43 +0000 (15:00 -0800)]
am
3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Jan 2011 22:56:29 +0000 (14:56 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Nick Pelly [Thu, 27 Jan 2011 22:12:49 +0000 (14:12 -0800)]
am
21d0a173: Fix build - javadoc.
* commit '
21d0a173f138563e2eaba286b0eb505f987918a9':
Fix build - javadoc.
Nick Pelly [Thu, 27 Jan 2011 22:07:50 +0000 (14:07 -0800)]
Fix build - javadoc.
Change-Id: I0168fb4a75f4dff88e347c0dfd1f0b39e2dba0d6
Eric Fischer [Thu, 27 Jan 2011 21:57:31 +0000 (13:57 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I1cf12c4a061a7982666176b42ac68d6dedd207ed
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:36:31 +0000 (13:36 -0800)]
Delete browerplugin tests - do not merge
Those don't build in all environments.
Change-Id: Ibeb8ac653f2961131d106864cc417c5ec58f2b36
Scott Main [Thu, 27 Jan 2011 21:29:13 +0000 (13:29 -0800)]
am
7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
* commit '
7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
Nick Pelly [Thu, 27 Jan 2011 21:25:52 +0000 (13:25 -0800)]
am
eab0e97b: Merge "Clean up MifareUltralight API." into gingerbread
* commit '
eab0e97bf0951057a0624cdde2f4bc5434ade0ac':
Clean up MifareUltralight API.
Scott Main [Thu, 27 Jan 2011 21:25:10 +0000 (13:25 -0800)]
Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final" into gingerbread
Nick Pelly [Thu, 27 Jan 2011 20:23:53 +0000 (12:23 -0800)]
Merge "Clean up MifareUltralight API." into gingerbread
Nick Pelly [Thu, 27 Jan 2011 18:04:04 +0000 (10:04 -0800)]
Clean up MifareUltralight API.
o Some javadoc updates
o writeBlock -> writePages (Block means something else in NFC Forum).
o validate page offset
Change-Id: Icae54db3397d57aaa451caaa86d56e8ba82507f2
Scott Main [Thu, 27 Jan 2011 19:26:29 +0000 (11:26 -0800)]
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d
revise info about emulator snapshots to indicate it's not final
Change-Id: Ica1584fce9d55deb224937e16696127718e501da
Eric Laurent [Thu, 27 Jan 2011 19:32:34 +0000 (11:32 -0800)]
Fix issue
2988031.
Limit SYSTEM stream volume when a headset is connected and music is playing.
Change-Id: Ieb44ae5bb53ffa9cd5fe8e317798eed279b78df8
Robert Greenwalt [Thu, 27 Jan 2011 18:20:33 +0000 (10:20 -0800)]
am
89a54408: Merge "Update networktype before sending state change." into gingerbread
* commit '
89a544088fcfa849be0d8824a2ac0a545950847b':
Update networktype before sending state change.
Robert Greenwalt [Thu, 27 Jan 2011 18:17:33 +0000 (10:17 -0800)]
Merge "Update networktype before sending state change." into gingerbread
Dirk Dougherty [Thu, 27 Jan 2011 18:08:09 +0000 (10:08 -0800)]
am
591a5f86: Doc change: fix adt archive filename.
* commit '
591a5f86bd4b3f1732b935daad909e4e63149f01':
Doc change: fix adt archive filename.
Dirk Dougherty [Thu, 27 Jan 2011 18:00:48 +0000 (10:00 -0800)]
Doc change: fix adt archive filename.
Change-Id: I1cf33678e52b4e85dca472763bfe53b7ecfcfb8b
Scott Main [Thu, 27 Jan 2011 02:37:22 +0000 (18:37 -0800)]
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
Scott Main [Thu, 27 Jan 2011 01:40:35 +0000 (17:40 -0800)]
enable preview mode for docs and add api level 10 flag for api level diffs
Change-Id: Ief2adca0f7f5c37d9381bd69d39a27aa11ec85dc
Scott Main [Thu, 27 Jan 2011 01:56:26 +0000 (17:56 -0800)]
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
Scott Main [Thu, 27 Jan 2011 01:52:08 +0000 (17:52 -0800)]
Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
Scott Main [Thu, 27 Jan 2011 00:23:37 +0000 (16:23 -0800)]
catchup the gingerbread branch to gingerbread-docs for all sdk docs
This is just a manual copy of all files that changed, rather than a dozen cherry picks.
Change-Id: I672f74a2ec9242a1d96713d1d84bfc4d2d47dd85
Andreas Huber [Thu, 27 Jan 2011 00:40:04 +0000 (16:40 -0800)]
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.
Andreas Huber [Wed, 26 Jan 2011 23:40:56 +0000 (15:40 -0800)]
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
And now we're just ignoring them. Yay standards.
Change-Id: Ia8c0b9161e606152fb681f0dda3ba901954dc749
related-to-bug:
3353752
Jeff Brown [Wed, 26 Jan 2011 23:03:32 +0000 (15:03 -0800)]
am
7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
* commit '
7b448b8a6c1ababc3a3e4553ebe9bac7473051c8':
Move keymaps from sdk/emulator/keymaps.
Jeff Brown [Wed, 26 Jan 2011 22:25:08 +0000 (14:25 -0800)]
Merge "Move keymaps from sdk/emulator/keymaps."
Dianne Hackborn [Wed, 26 Jan 2011 22:08:30 +0000 (14:08 -0800)]
am
1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
* commit '
1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
Jean-Michel Trivi [Wed, 26 Jan 2011 22:05:18 +0000 (14:05 -0800)]
am
2ba92c71: do not merge bug
3370834 Cherrypick from master
* commit '
2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug
3370834 Cherrypick from master
Dianne Hackborn [Wed, 26 Jan 2011 21:59:42 +0000 (13:59 -0800)]
Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
Robert Greenwalt [Wed, 26 Jan 2011 18:45:10 +0000 (10:45 -0800)]
Update networktype before sending state change.
Fixes potential race condition in network-type info. May fix this issue.
bug:
3376930
Change-Id: I3d5fd7c76e54923b62c56defa947be3c9c1cd585
Dianne Hackborn [Wed, 26 Jan 2011 20:40:18 +0000 (12:40 -0800)]
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
Change-Id: I53a6671d5478e7dbca44b17d90f1edfa8e3420bc
Jean-Michel Trivi [Mon, 15 Nov 2010 20:11:32 +0000 (12:11 -0800)]
do not merge bug
3370834 Cherrypick from master
Cherripick from master CL 79833, 79417, 78864, 80332, 87500
Add new audio mode and recording source for audio communications
other than telelphony.
The audio mode MODE_IN_CALL signals the system the device a phone
call is currently underway. There was no way for audio video
chat or VoIP applications to signal a call is underway, but not
using the telephony resources. This change introduces a new mode
to address this. Changes in other parts of the system (java
and native) are required to take this new mode into account.
The generic AudioPolicyManager is updated to not use its phone
state variable directly, but to use two new convenience methods,
isInCall() and isStateInCall(int) instead.
Add a recording source used to designate a recording stream for
voice communications such as VoIP.
Update the platform-independent audio policy manager to pass the
nature of the audio recording source to the audio policy client
interface through the AudioPolicyClientInterface::setParameters()
method.
SIP calls should set the audio mode to MODE_IN_COMMUNICATION,
Audio mode MODE_IN_CALL is reserved for telephony.
SIP: Enable built-in echo canceler if available.
1. Always initialize AudioRecord with VOICE_COMMUNICATION.
2. If echo canceler is available, disable our echo suppressor.
Note that this CL is intentionally not correcting the
getAudioSourceMax() return value in MediaRecorder.java as the
new source is hidden here.
Change-Id: Ie68cd03c50553101aa2ad838fe9459b2cf151bc8
Kenny Root [Wed, 26 Jan 2011 17:25:43 +0000 (09:25 -0800)]
am
138757db: Merge "Make OBB results a one-way call" into gingerbread
* commit '
138757db4f19cb626ef5c1d371d4fca004304a08':
Make OBB results a one-way call
Kenny Root [Wed, 26 Jan 2011 17:17:28 +0000 (09:17 -0800)]
Merge "Make OBB results a one-way call" into gingerbread
Ritu Srivastava [Wed, 26 Jan 2011 00:23:08 +0000 (16:23 -0800)]
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>
Jeff Brown [Wed, 26 Jan 2011 03:08:04 +0000 (19:08 -0800)]
Move keymaps from sdk/emulator/keymaps.
Change-Id: Ia10992a5988641b338cb4a50f57deadd5188a5e2
Kenny Root [Wed, 26 Jan 2011 00:39:35 +0000 (16:39 -0800)]
Make OBB results a one-way call
OBB result back to an application needs to be a one-way binder call.
Bug:
3353699
Change-Id: I0e625914d18a001c2fa9d764ea6463f34cf96743
Jeff Hamilton [Wed, 26 Jan 2011 00:15:58 +0000 (16:15 -0800)]
am
c33acae9: Merge "Fix the build, proper current.xml." into gingerbread
* commit '
c33acae9060162c5d2c28613b71c3bb1e0ef4c1c':
Fix the build, proper current.xml.
Jeff Hamilton [Wed, 26 Jan 2011 00:11:37 +0000 (16:11 -0800)]
Merge "Fix the build, proper current.xml." into gingerbread
Jeff Hamilton [Wed, 26 Jan 2011 00:10:58 +0000 (18:10 -0600)]
Fix the build, proper current.xml.
Change-Id: I9b02206042c74fd5c329fe2b70ed2b6b91d41382
Brad Fitzpatrick [Tue, 25 Jan 2011 23:44:33 +0000 (15:44 -0800)]
am
a206efcf: Merge "android.os.Message: respect sPoolSize"
* commit '
a206efcf8d2e56cbd0d1de125b29b45fc6cc8431':
android.os.Message: respect sPoolSize
Brad Fitzpatrick [Tue, 25 Jan 2011 23:12:18 +0000 (15:12 -0800)]
Merge "android.os.Message: respect sPoolSize"
Brad Fitzpatrick [Tue, 25 Jan 2011 22:48:21 +0000 (14:48 -0800)]
android.os.Message: respect sPoolSize
Also rename some static members from mFoo to sFoo.
Bug: http://code.google.com/p/android/issues/detail?id=13866
Change-Id: I5c5075eb6f529d1534c7aa72b6881873cd08676a
Mathias Agopian [Tue, 25 Jan 2011 22:46:40 +0000 (14:46 -0800)]
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)
Mathias Agopian [Tue, 25 Jan 2011 22:46:35 +0000 (14:46 -0800)]
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)
Mathias Agopian [Tue, 25 Jan 2011 22:46:31 +0000 (14:46 -0800)]
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)
Mathias Agopian [Tue, 25 Jan 2011 22:46:27 +0000 (14:46 -0800)]
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)
Mathias Agopian [Tue, 25 Jan 2011 22:46:22 +0000 (14:46 -0800)]
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)
Mathias Agopian [Tue, 25 Jan 2011 22:43:21 +0000 (14:43 -0800)]
Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:14 +0000 (14:43 -0800)]
Merge "partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:09 +0000 (14:43 -0800)]
Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:05 +0000 (14:43 -0800)]
Merge "workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:42:59 +0000 (14:42 -0800)]
Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
Jeff Hamilton [Tue, 25 Jan 2011 22:41:55 +0000 (14:41 -0800)]
am
f126ad3b: Merge "Use classnames instead of ints for NFC techs." into gingerbread
* commit '
f126ad3b6484ef62eed202f1f49cc4557c0a3848':
Use classnames instead of ints for NFC techs.
Jeff Hamilton [Tue, 25 Jan 2011 22:35:46 +0000 (14:35 -0800)]
Merge "Use classnames instead of ints for NFC techs." into gingerbread
Jeff Hamilton [Mon, 24 Jan 2011 20:53:00 +0000 (14:53 -0600)]
Use classnames instead of ints for NFC techs.
This makes the system more flexible and allows
adding new technology types without having to
update the API.
Change-Id: Iaee6b633965e501a70e8afc3f1d54d9d94a4d05a
Mathias Agopian [Tue, 18 Jan 2011 23:51:30 +0000 (15:51 -0800)]
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.
Mathias Agopian [Sat, 15 Jan 2011 01:37:42 +0000 (17:37 -0800)]
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.
Mathias Agopian [Fri, 17 Dec 2010 02:46:17 +0000 (18:46 -0800)]
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