Vasu Nori
6ea47744d3
Merge "fix downloadmanager tests. add few more. fix some. isolate flaky ones"
2010-12-16 10:28:27 -08:00
Eric Laurent
7f8c68b662
Merge "Fix error in HDMI and digital dock intent strings"
2010-12-16 10:28:05 -08:00
Andreas Huber
e06322caee
Merge "Remove now obsolete implementation of streaming from AwesomePlayer."
2010-12-16 10:26:48 -08:00
Andreas Huber
67e7ae7ca4
Merge "Properly announce decoder output format changes, make sure AMessage::dup does."
2010-12-16 10:26:37 -08:00
James Dong
edde87365d
Merge "Give the standard not compliant video sample a chance if its size in the mp4 header is invalid"
2010-12-16 10:24:27 -08:00
Iain Merrick
e164ef1c82
Merge "*Don't* disable CacheManager when using Chromium HTTP stack."
2010-12-16 08:52:14 -08:00
Kristian Monsen
f754a12b03
Merge "Fix for crash in third-party app"
2010-12-16 08:23:45 -08:00
Hung-ying Tyan
e70a8c1551
Merge "Check port in create peer's SIP profile."
2010-12-16 07:56:35 -08:00
Patrick Scott
15e54831b5
Merge "Add EXTRA_SKIP_UI to skip the confirmation page."
2010-12-16 06:05:16 -08:00
Steve Block
b4318cfadc
Merge "Add LayoutTest http/tests/appcache/foreign-fallback.html to the DRT ignore list"
2010-12-16 05:37:27 -08:00
Scott Main
1d7e1b304d
Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread
2010-12-15 17:47:02 -08:00
Jaikumar Ganesh
1a4a8587c4
Merge "Add FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT to name changed broadcast."
2010-12-15 16:07:43 -08:00
James Dong
fd896bc67c
Merge "Opted to recognize "h263" or "H263" boxes in an mp4 file"
2010-12-15 16:05:24 -08:00
Gilles Debunne
14deb08843
Merge "Support custom themes in TabHost."
2010-12-15 16:01:47 -08:00
Dianne Hackborn
99c86afda6
Merge "Turn thumbnails back on."
2010-12-15 15:56:22 -08:00
Mathias Agopian
e6f0984361
workaround [3201922] display not on: log full of gralloc errors
...
while we're waiting for the real fix in the gralloc/gpu driver,
this workaround should resolve the issue.
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: I3cb5ad67d48c81a23100172bab77e86a70e29152
2010-12-15 15:54:57 -08:00
Robert Greenwalt
6efa81cff2
Merge "Correct an error code to pass CTS."
2010-12-15 15:48:03 -08:00
Andreas Huber
3a6777f422
Merge "Properly order the data written out to the transport stream by timestamp."
2010-12-15 15:37:30 -08:00
Patrick Dubroy
4b4a005a89
Merge "Allow a JNI local ref to be passed directly into globalRef()."
2010-12-15 15:33:29 -08:00
Andreas Huber
d090b053ea
Merge "Initial support for a true streaming player for mpeg2 transport streams."
2010-12-15 15:22:29 -08:00
Brad Fitzpatrick
ca9f16af54
Merge "Put Log.wtf's terrible failure in logcat -b main."
2010-12-15 15:16:42 -08:00
Svetoslav Ganov
f6b7f552cb
Merge "Updating the light Date picker theme. Some UI fixes."
2010-12-15 15:13:49 -08:00
Andreas Huber
a1aca6f49f
Merge "Proper recovery of timestamp information in the transport stream parser."
2010-12-15 14:55:29 -08:00
Jim Miller
b97eeb43b9
Merge "Fix 3148496: Update LockScreen assets & layouts"
2010-12-15 14:55:04 -08:00
Daniel Sandler
fe950dc019
Merge "Remove unused assets in SystemUI."
2010-12-15 14:54:52 -08:00
Scott Main
fb515f22e9
am 61aeb2b7: (-s ours) am b094b0c4: modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
...
* commit '61aeb2b7212cae211ce68b3600ddbe69c6e98bb3':
modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
2010-12-15 14:39:33 -08:00
Mathias Agopian
589cf24909
Merge "Fix a problem where hwc and GL composition could show a different buffer"
2010-12-15 14:38:57 -08:00
Jim Miller
733ea55ebf
Merge "Fix 3201849: Tweak WaveView animation; update resource."
2010-12-15 14:12:21 -08:00
Scott Main
46c3ecd9f4
am b094b0c4: modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
...
* commit 'b094b0c4a4309f48d9da7253de78ebda20a8a81c':
modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
2010-12-15 14:11:08 -08:00
Jim Miller
ee12e19186
Merge "Fix 3253629: Tweaks to recent apps"
2010-12-15 14:10:49 -08:00
Xavier Ducrohet
114b271e90
Merge "LayoutLib: replace the stack of Graphics2D with custom snapshots."
2010-12-15 13:50:37 -08:00
Adam Cohen
c74bb5e79e
Merge "Fix in StackView layout"
2010-12-15 13:18:33 -08:00
Dianne Hackborn
ee9b385a89
am b32ea255: am 7daaa98c: Merge "Fix issue #3149290 : java.lang.RuntimeException: Unable to pause activity" into gingerbread
...
* commit 'b32ea25529589a77ede8faf278068157107ba897':
Fix issue #3149290 : java.lang.RuntimeException: Unable to pause activity
2010-12-15 13:00:52 -08:00
Dianne Hackborn
17b34c8155
am 7daaa98c: Merge "Fix issue #3149290 : java.lang.RuntimeException: Unable to pause activity" into gingerbread
...
* commit '7daaa98c6531373a2a742c1360f0a2795de0619f':
Fix issue #3149290 : java.lang.RuntimeException: Unable to pause activity
2010-12-15 12:58:54 -08:00
Dianne Hackborn
a43aa9c8fc
Merge "Fix issue #3149290 : java.lang.RuntimeException: Unable to pause activity" into gingerbread
2010-12-15 12:56:53 -08:00
Patrick Dubroy
223a11d9eb
Merge "Turn fatal assertion in decodeRegion into a warning."
2010-12-15 12:44:32 -08:00
Scott Main
da7d566709
Merge "docs: updates to menu resource doc for new attributes"
2010-12-15 12:11:10 -08:00
Scott Main
6f8730da02
am 9278d321: am 52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
...
* commit '9278d3216837ad45eae13b87f04f050acb4ddafa':
cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
2010-12-15 12:01:58 -08:00
Scott Main
2f1543e56b
am d88c90fb: am 6390fa6b: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
...
* commit 'd88c90fb0805b2dda5664f413b32ada5a5fa6fdc':
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
2010-12-15 12:01:53 -08:00
Scott Main
eafa4d5b19
am 8591872a: am 92b03085: cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
...
* commit '8591872a5c37754aa3be3ef575d3de667f8ee70c':
cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
2010-12-15 11:59:16 -08:00
Scott Main
4e9f47951d
am 52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
...
* commit '52078255dacabe9b779613b032a4dc3706b2b5d3':
cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
2010-12-15 11:56:04 -08:00
Scott Main
2a0c84911a
am 6390fa6b: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
...
* commit '6390fa6bdf50a3bf10cd6c54328397fe709f7c37':
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
2010-12-15 11:56:00 -08:00
Scott Main
fcdb5893fa
am 92b03085: cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
...
* commit '92b0308530d21195425c918cbe6057dd84f37992':
cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
2010-12-15 11:53:20 -08:00
Eric Laurent
200d9b28c8
Merge "Change audio routing policy for HDMI"
2010-12-15 11:48:46 -08:00
Adam Cohen
801a28e6b2
Merge "New stack visualization"
2010-12-15 11:20:43 -08:00
Irfan Sheriff
97656c362e
Merge "Use clear names for native API"
2010-12-15 11:18:04 -08:00
Robert Greenwalt
e9cce1f5a2
Merge "Fix some older (depricated) API so they work."
2010-12-15 11:13:21 -08:00
Alex Sakhartchouk
6cda55c4a2
Merge "Cleanup and refactoring of an earlier cl."
2010-12-15 11:05:23 -08:00
Irfan Sheriff
efecc3ded6
Merge "Handle supplicant stop correctly"
2010-12-15 09:58:12 -08:00
Huahui Wu
ad934fab96
Merge "b/2864818 Prompt the SSL error dialog to user and proceed or cancel the request. C++ side cl: https://android-git.corp.google.com/g/#change,84529 "
2010-12-15 09:42:35 -08:00