John Wang
91d3dd13ed
am 7319d94f: am 99f2a4bb: Merge "Add Event log for RAT switch." into eclair
...
Merge commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af'
* commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af':
Add Event log for RAT switch.
2010-01-21 12:47:13 -08:00
Amith Yamasani
3f0f4602b8
Merge "Workaround for a database update callback that claims that the data doesn't exist."
2010-01-21 11:22:01 -08:00
Andreas Huber
c79a720825
Merge "Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup."
2010-01-21 10:44:54 -08:00
Andreas Huber
27ed8d59bf
Merge "Special-case .wmv and .wma metadata retrieval and playback to use PV if available."
2010-01-21 10:44:47 -08:00
Vasu Nori
dc11327790
Merge "caching PRAGMA sql statements caused cts-tests failures."
2010-01-21 10:29:22 -08:00
Derek Sollenberger
0cb6ce5f88
am 1f7747ad: am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode.
...
Merge commit '1f7747adb6a79317f4bd52fb78b3c567dd203883'
* commit '1f7747adb6a79317f4bd52fb78b3c567dd203883':
Resize the WebView when the soft-keyboard appears in landscape mode.
2010-01-21 08:39:15 -08:00
Derek Sollenberger
224b2a71c0
am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode.
...
Merge commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1' into eclair-mr2-plus-aosp
* commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1':
Resize the WebView when the soft-keyboard appears in landscape mode.
2010-01-21 08:29:33 -08:00
Mike Lockwood
1d42c81cc5
Merge "Implement Notification.DEFAULT_LIGHTS flag."
2010-01-21 08:18:15 -08:00
San Mehat
1db4b8e107
Merge "INetworkManagementService: Add support for enumerating TTYs and attaching ppp servers to them"
2010-01-20 18:15:43 -08:00
San Mehat
3b03d70640
Merge "NativeDaemonConnector: Add a convenience method for obtaining lists"
2010-01-20 18:12:54 -08:00
Andreas Huber
b36043d2de
Merge "Fix no-copy-overhead OMXCodec implementation to actually work."
2010-01-20 16:07:23 -08:00
Vasu Nori
9bc05a6682
Merge "reduce logging noise from cache-full conditions."
2010-01-20 15:41:54 -08:00
Jim Miller
b368c4ad8c
Merge "Fix 2385283: Add DevicePolicyManager calls to LockScreen."
2010-01-20 15:12:04 -08:00
Mathias Agopian
8f17896782
Merge "fix [2363362] [Sapphire] Corrupted raw picture displayed during snapshot"
2010-01-20 15:08:33 -08:00
Mathias Agopian
54b2f26d11
Merge "part of fix for [2363362] [Sapphire] Corrupted raw picture displayed during snapshot"
2010-01-20 15:08:27 -08:00
Joe Onorato
058cd973e4
am b3699b14: am 836e1666: Merge "add drawSpriteScreenspaceCropped to renderscript" into eclair
...
Merge commit 'b3699b14be3a3db1d75ea4c38853b0a53d14b1be'
* commit 'b3699b14be3a3db1d75ea4c38853b0a53d14b1be':
add drawSpriteScreenspaceCropped to renderscript
2010-01-20 14:35:52 -08:00
Mathias Agopian
5fdea8d5b0
fix [2363362] [Sapphire] Corrupted raw picture displayed during snapshot
...
handled all cases where the scale factor of a video is out of bounds of
supported scale factors in copybit.
2010-01-20 14:31:53 -08:00
Jacek Surazski
51201cd347
Merge "Add systemApp field to ApplicationErrorReport"
2010-01-20 14:14:12 -08:00
Barry Hayes
bd2406ce98
Merge "Check the boolean value for the arg to ZygoteInit to make sure it's either true or false. Make a slightly more informative usage message. Give developers a slightly easier way to have their preloaded classes list out of sync without blowing up."
2010-01-20 14:11:26 -08:00
Mathias Agopian
ecc99c003b
part of fix for [2363362] [Sapphire] Corrupted raw picture displayed during snapshot
...
make sure to fallback properly to software when copybit operation fails.
with this change, the preview image will at least be displayed in b&w
(since GL doesn't support the yuv format). This would also fix
2363506, but that one is now handled more cleanly.
2010-01-20 14:07:44 -08:00
Mathias Agopian
42d095aaa5
Merge "fix [2363506] [Sapphire] Video playback broken"
2010-01-20 13:44:53 -08:00
Mathias Agopian
1faed66086
fix [2363506] [Sapphire] Video playback broken
...
don't try to use copybit for incompatible buffers
2010-01-20 13:24:14 -08:00
Makoto Onuki
f221217a67
Merge "DomainNameValiator: Remove workaround"
2010-01-20 12:03:24 -08:00
Andreas Huber
59314535b9
Merge "Adds support for 8-bit (unsigned) PCM wave files."
2010-01-20 11:43:25 -08:00
Andreas Huber
e1096b515e
Merge "Support for 'iTunes-style' metadata in .mp4 and .3gp files."
2010-01-20 11:35:02 -08:00
Eric Laurent
f05b4a481d
Merge "Create base class for audio policy manager."
2010-01-20 10:03:36 -08:00
Makoto Onuki
eac7055b40
DomainNameValiator: Remove workaround
...
Remove the workaround introduced in CL 68137-p9.
Validation should fail when a certification can't be parsed.
Bug: 2369689
2010-01-20 09:58:42 -08:00
Makoto Onuki
73b2c3c505
Merge "Addign more tests for DomainNameValidator."
2010-01-20 09:22:42 -08:00
Tom O'Neill
2e419abb0f
Merge "Get rid of a TODO to add documentation for now-hidden columns"
2010-01-20 09:15:14 -08:00
Jason Sams
3b7cc73151
Merge "Fix RS mipmap generation for 8 bit alpha textures."
2010-01-19 17:54:27 -08:00
Romain Guy
d5c111d3c6
Merge "Measure AutoCompleteTextView's dropdown to have enough room for all items. Bug #2363514 "
2010-01-19 16:57:51 -08:00
Joe Onorato
f69cd0e98d
Merge "Add DateTimeView, a widget that shows a time or the date depending on the current time. Use that for notifications instead of a TextView that doesn't ever update."
2010-01-19 16:45:05 -08:00
Scott Main
6506626c48
am 7cc57ff2: am 0409b1ba: Merge "docs: remove dev guide link from download confirmation content so we only link to the install guide and re-affirm the system reqs bug: 2374363,2374334" into eclair
...
Merge commit '7cc57ff22d23daa62e07e0f3d28010d75ed19eea'
* commit '7cc57ff22d23daa62e07e0f3d28010d75ed19eea':
docs: remove dev guide link from download confirmation content
2010-01-19 16:35:10 -08:00
Xavier Ducrohet
295df3eb5a
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base
2010-01-19 16:35:00 -08:00
Joe Onorato
a4d81b947b
Merge "Make the space between the time and the AM/PM smaller by putting preceding whitespace inside the span."
2010-01-19 16:34:58 -08:00
Xavier Ducrohet
5e4cc6541d
am f95e3dd2: am 5e083024: ADT/Layoutlib: shader clean-up.
...
Merge commit 'f95e3dd23cb6cbd7a86dece3c4bafff71307721a'
* commit 'f95e3dd23cb6cbd7a86dece3c4bafff71307721a':
ADT/Layoutlib: shader clean-up.
2010-01-19 16:34:48 -08:00
Xavier Ducrohet
28b9e8dc98
am e1a99147: am d3026e16: Merge "ADT/Layoutlib: 2 color, linear gradient support." into eclair
...
Merge commit 'e1a991476365cf1a8249c842e2b936db6940b0a7'
* commit 'e1a991476365cf1a8249c842e2b936db6940b0a7':
ADT/Layoutlib: 2 color, linear gradient support.
2010-01-19 16:34:32 -08:00
Grace Kloba
9b352fe319
am 181963a0: (-s ours) am 196926b9: Merge "DO NOT MERGE" into eclair
...
Merge commit '181963a0200e7c442d66f9f893da41e2b52a4d8c'
* commit '181963a0200e7c442d66f9f893da41e2b52a4d8c':
DO NOT MERGE
2010-01-19 16:34:11 -08:00
Makoto Onuki
1b925b0998
Addign more tests for DomainNameValidator.
...
Added tests that use actual certificates.
See bug:2369689 for background.
2010-01-19 15:03:10 -08:00
Suchi Amalapurapu
fbf4202c89
Merge "Mount/Unmount secure containers Persist flags in PackageSetting. Flags are relevant to ApplicationInfo.FLAG_SYSTEM, Application.FLAG_ON_SDCARD, ApplicationInfo.FLAG_FORWARD_LOCK. New pm command to simulate mount/unmount in Pm. This will be removed when MountService/vold event generation gets fixed. Calls from MountService into PackageManager when media gets mounted/unmounted. Scan the packages and grant permissions when the sdcard gets mounted. This api might change again."
2010-01-19 14:11:43 -08:00
Andreas Huber
e9bcc2d714
Merge "Fix trailing garbage after UCS-2 encoded strings in ID3 V2."
2010-01-19 14:05:46 -08:00
Andreas Huber
8109b50a99
Merge "Support for ID3 version 1 (and 1.1) tags in .mp3 files."
2010-01-19 14:05:40 -08:00
Tom O'Neill
3c07d53599
Merge "Find out whether we should mention behavior specific to our own provider"
2010-01-19 13:54:00 -08:00
Romain Guy
eb3854cb76
Merge "Make sure the drawing cache is invalidated when reattaching a view. Bug #2373677 "
2010-01-19 13:29:03 -08:00
Andreas Huber
083becb715
Merge "Avoid unnecessary buffer copying if at all possible, detect if running in the mediaserver process."
2010-01-19 11:43:12 -08:00
Doug Kwan
8f5d80e263
Merge "Add missing libjpeg in linker option. Currently this library is used by the main executable but is included implicitly via inter-library dependency."
2010-01-19 11:42:15 -08:00
James Dong
488b3ced7f
Merge "Media server death nodification"
2010-01-19 11:37:55 -08:00
San Mehat
b3125d8468
Merge "framework: Introduce INetworkManagementService for communicating with netd"
2010-01-19 11:21:44 -08:00
Mike Lockwood
084e7c4ee8
Merge "LocationManagerService: Fix bug removing proximity alerts."
2010-01-19 11:03:19 -08:00
Andreas Huber
e0d029dfe5
Merge "Squashed commit of the following:"
2010-01-19 10:51:33 -08:00