Eric Laurent
65d887d3eb
am a1608902: am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
...
* commit 'a1608902f95dc8ff31a52c1f1c384829a803a701':
Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
2010-12-16 16:10:24 -08:00
Scott Main
73ad9c1bdd
am 49cdfcf5: am 3165bbb1: cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move
...
* commit '49cdfcf574996bbe37bf547bac105f9df71253ac':
cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move
2010-12-16 16:10:16 -08:00
Scott Main
6445022cf4
am c4172983: am 4ea442b4: 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
...
* commit 'c4172983fb1a5ce1eec08ae1196844bd469643e8':
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
2010-12-16 16:10:09 -08:00
Martijn Coenen
0afdb9e24d
am 12e5c1a2: am c58c3f1a: Implement additional Mifare Ultralight convenience methods.
...
* commit '12e5c1a21ee0dad786e8e5e7f7ca18e8ffdd53e5':
Implement additional Mifare Ultralight convenience methods.
2010-12-16 16:10:02 -08:00
Martijn Coenen
75d2fc9578
am bf76b52f: am 0d27f999: Expose reconnect(), to allow applications to reset tag state.
...
* commit 'bf76b52f05384feddb073ee6aa18091f701d069b':
Expose reconnect(), to allow applications to reset tag state.
2010-12-16 16:09:55 -08:00
Martijn Coenen
f478e32a5c
am 9dce44ff: am 4049f9d0: Implement multi-tech connect, enfore tech exclusivity.
...
* commit '9dce44ffbb0edcc59b7f72a59099abb313167d0b':
Implement multi-tech connect, enfore tech exclusivity.
2010-12-16 16:09:42 -08:00
Eric Laurent
104dfa8fc4
am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
...
* commit '5a756fb0f1f3f8cd7612284c889dfc69875577a8':
Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
2010-12-16 16:05:16 -08:00
Scott Main
c7f6609ccd
am 3165bbb1: cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move
...
* commit '3165bbb15560ed9facdfb906da55a9b24eb5989a':
cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move
2010-12-16 16:05:00 -08:00
Scott Main
1b14e01181
am 4ea442b4: 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
...
* commit '4ea442b49c2f44c180346fe780a2b8c9766b587b':
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
2010-12-16 16:04:54 -08:00
Martijn Coenen
ee657700cc
am c58c3f1a: Implement additional Mifare Ultralight convenience methods.
...
* commit 'c58c3f1ae27c0c7f560bd381180397d7f6a2ebed':
Implement additional Mifare Ultralight convenience methods.
2010-12-16 16:04:47 -08:00
Martijn Coenen
e375baec4c
am 0d27f999: Expose reconnect(), to allow applications to reset tag state.
...
* commit '0d27f999f4b1ad51da11946800b40d2978fc6326':
Expose reconnect(), to allow applications to reset tag state.
2010-12-16 16:04:41 -08:00
Martijn Coenen
735ad9416c
am 4049f9d0: Implement multi-tech connect, enfore tech exclusivity.
...
* commit '4049f9d00a86f848d42d2429068496b31a6795ad':
Implement multi-tech connect, enfore tech exclusivity.
2010-12-16 16:04:28 -08:00
Irfan Sheriff
2f59690c25
Merge "Fix ssid storage regression"
2010-12-16 14:46:32 -08:00
Joe Onorato
03a4940bd7
Merge "Fix the SettingsView so it shows again."
2010-12-16 13:55:50 -08:00
Dianne Hackborn
a1e8a50d34
Merge "Fix issue #3291975 : Google services frame work crash..."
2010-12-16 13:07:28 -08:00
Mike Lockwood
2f6f5d7ffa
Merge "Add Process.MEDIA_RW_GID constant"
2010-12-16 12:59:07 -08:00
Andreas Huber
5475cd5e90
Merge "Instead of asserting, gracefully abort and signal and error."
2010-12-16 12:39:37 -08:00
Jason Sams
c9c3ac2e02
Merge "Remove outdated texture upload functions."
2010-12-16 12:22:01 -08:00
Jesse Wilson
ac4f95fcca
Merge "New tests for AndroidHttpClient with a proxy server."
2010-12-16 12:16:52 -08:00
Mike LeBeau
210bd735e9
Merge "Add new EXTRA_WEB_SEARCH_ONLY to RecognizerIntent API. This can be used to avoid triggering any non-web-search actions from the speech recognizer (such as Voice Actions in the Google implementation). The browser will set this to true to avoid triggering non-web-search actions when speech recognition is requested from the browser."
2010-12-16 11:43:30 -08:00
Eric Laurent
b6272d14f1
Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
2010-12-16 11:18:29 -08:00
Andreas Huber
7a30f3c93b
Merge "The HTTP/1.1 Host request header must include port if it's not the default (80)."
2010-12-16 10:51:15 -08:00
Eric Laurent
09907472ea
Merge "Fix speakerphone routing to analog dock"
2010-12-16 10:41:16 -08:00
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