James Dong
b9ddd779ae
am 10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread
...
Merge commit '10ed3f7438f6ae797bac32476dc61465c6484c85' into gingerbread-plus-aosp
* commit '10ed3f7438f6ae797bac32476dc61465c6484c85':
Add input buffer size check for software video encoders
2010-08-10 13:28:56 -07:00
James Dong
10ed3f7438
Merge "Add input buffer size check for software video encoders" into gingerbread
2010-08-10 13:27:09 -07:00
Daniel Sandler
dfa08db165
Incremental system bar improvements.
...
- scrolling list of notifications
- fixed crashes when inserting notifications
- new "expand" icon in prep for different touch behavior on
notification icons
- adjustments to the Ticker API in preparation for Kicker
work
Change-Id: I18908cbb2bbbfb7969c7bb48dbda67697732c438
2010-08-10 16:19:33 -04:00
Andreas Huber
3965148396
am 4dc41bb4: am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbrea
...
Merge commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28'
* commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
2010-08-10 13:04:42 -07:00
Andreas Huber
4dc41bb445
am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
...
Merge commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48' into gingerbread-plus-aosp
* commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
2010-08-10 13:01:58 -07:00
Andreas Huber
18f0174ff4
Merge "We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
2010-08-10 12:59:27 -07:00
Romain Guy
623ee2a569
Merge "Fix tons of bugs and add new text rendering support."
2010-08-10 12:23:49 -07:00
Nipun Kwatra
f5e9018b80
Merge "use usleep instead of sleep."
2010-08-10 12:22:13 -07:00
Romain Guy
61c8c9c5b2
Fix tons of bugs and add new text rendering support.
...
Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
2010-08-10 12:22:01 -07:00
Eric Fischer
8c9d61c459
Merge "Import revised translations."
2010-08-10 12:18:50 -07:00
Mike Lockwood
e75504d2c7
Merge "MTP: Fix wrong delete operator from previous change."
2010-08-10 12:13:23 -07:00
Mike Lockwood
33ea5a4e86
MTP: Fix wrong delete operator from previous change.
...
Change-Id: I64e8fdc610495f21060727b6bed42d1584833405
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-10 15:11:32 -04:00
Eric Fischer
28269e91d1
Import revised translations.
...
Change-Id: Idaaed3b13133d531dfd6055809c66df3fba250bb
2010-08-10 12:10:18 -07:00
Nipun Kwatra
7913998c4b
use usleep instead of sleep.
...
Minor bugfix. sleep doesn't take fractional value for seconds, so use
usleep instead of sleep for sleeping small times.
Change-Id: I40e45c30cc595a54c18601117b9a1a3637652f60
2010-08-10 12:08:17 -07:00
Eric Fischer
0dd8798e32
am c7af4c5c: (-s ours) am 605f4027: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
Merge commit 'c7af4c5c5aff84fc70ac4d6e1547197d56a9ee9a'
* commit 'c7af4c5c5aff84fc70ac4d6e1547197d56a9ee9a':
Import revised translations. DO NOT MERGE
2010-08-10 12:04:09 -07:00
Eric Rowe
542cf2c9cf
am 7cb0fc58: am edae848e: am 301c437b: Remove @LargeTest annotations
...
Merge commit '7cb0fc588042f7642f13ea2cc404eae04bd5509a'
* commit '7cb0fc588042f7642f13ea2cc404eae04bd5509a':
Remove @LargeTest annotations
2010-08-10 12:04:04 -07:00
Eric Fischer
c7af4c5c5a
am 605f4027: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
Merge commit '605f402796afa9c88e2f91284e98d1f59a0726aa' into gingerbread-plus-aosp
* commit '605f402796afa9c88e2f91284e98d1f59a0726aa':
Import revised translations. DO NOT MERGE
2010-08-10 12:00:12 -07:00
Eric Rowe
7cb0fc5880
am edae848e: am 301c437b: Remove @LargeTest annotations
...
Merge commit 'edae848eb62e27b8e987aa89557d1456304fada7' into gingerbread-plus-aosp
* commit 'edae848eb62e27b8e987aa89557d1456304fada7':
Remove @LargeTest annotations
2010-08-10 12:00:07 -07:00
Eric Fischer
605f402796
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-08-10 11:54:24 -07:00
Eric Rowe
edae848eb6
am 301c437b: Remove @LargeTest annotations
...
Merge commit '301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread
* commit '301c437b554e2152f3f6fffadc680f5cbf8e8231':
Remove @LargeTest annotations
2010-08-10 11:53:59 -07:00
Eric Fischer
06a43dcf48
Import revised translations. DO NOT MERGE
...
Change-Id: I24dd4ee2c61694e917db02c92396134df65c0218
2010-08-10 11:50:15 -07:00
Andreas Huber
ac4bbc2e18
am 193985ff: am 235be391: Merge "Many, many developers misread or don\'t read the http specs and terminate lines with \'\n\' instead of CRLF \'\r\n\' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into ginger
...
Merge commit '193985ffd553c139e8c1094d7798edbe5b0797c5'
* commit '193985ffd553c139e8c1094d7798edbe5b0797c5':
Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
2010-08-10 11:47:04 -07:00
Andreas Huber
193985ffd5
am 235be391: Merge "Many, many developers misread or don\'t read the http specs and terminate lines with \'\n\' instead of CRLF \'\r\n\' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread
...
Merge commit '235be391f3b9cd79e525de87757e361ae044940d' into gingerbread-plus-aosp
* commit '235be391f3b9cd79e525de87757e361ae044940d':
Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
2010-08-10 11:45:01 -07:00
Trevor Johns
ca56ffe9e8
Fix subscribe links for Developer Forums doc.
...
The email-based subscribe links for the Android Developer forums do
not work for two groups (android-discuss, android-beginners) due to
recent changes in those groups. These links need to be changed to
HTML-based subscribe links instead.
For consistency, other links are being changed to use the HTML-based
subscription mechanism as well.
Internal Bug: 2908002
Change-Id: I601b959935584270d6107c4600b28ac5f51359e1
2010-08-10 11:41:56 -07:00
Andreas Huber
235be391f3
Merge "Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread
2010-08-10 11:39:38 -07:00
Andreas Huber
f88f84414a
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
...
Change-Id: Idc3df74b42000f7a6aa3eae090718dc9d9c4186f
2010-08-10 11:38:18 -07:00
Ben Dodson
926bd956d6
Merge "Updated error codes for Doclava migration"
2010-08-10 11:26:48 -07:00
Chet Haase
8cc82c6f48
Merge "Add 3D rotation to View"
2010-08-10 11:01:42 -07:00
James Dong
898d5cdda2
am a0488341: am 532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread
...
Merge commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990'
* commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990':
Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
2010-08-10 10:48:59 -07:00
James Dong
e6daea5940
Add input buffer size check for software video encoders
...
Change-Id: I03953a1245060ed6656a965e1a8a61386126c441
2010-08-10 10:46:11 -07:00
James Dong
a04883412e
am 532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread
...
Merge commit '532d2ac5d5c06c3938c4999238d1051207bfe53c' into gingerbread-plus-aosp
* commit '532d2ac5d5c06c3938c4999238d1051207bfe53c':
Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
2010-08-10 10:44:25 -07:00
Ben Dodson
3fbe150d36
Updated error codes for Doclava migration
...
Change-Id: Id8e8d0a47ae863cbdfb56569860fc0f56c644e97
2010-08-10 10:42:21 -07:00
James Dong
532d2ac5d5
Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread
2010-08-10 10:41:29 -07:00
Chet Haase
fd2b002bcf
Add 3D rotation to View
...
Change-Id: I4aa2542eb821e82d44e13d69b0938de13ffd4f0d
2010-08-10 10:36:21 -07:00
Brett Chabot
7c997d209b
am 4f941812: am e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread
...
Merge commit '4f94181282e7f23d19a5fcab5f1b93d6d52e7715'
* commit '4f94181282e7f23d19a5fcab5f1b93d6d52e7715':
Fix gingerbread FrameworkCoreTests makefile.
2010-08-10 10:34:00 -07:00
Brett Chabot
4f94181282
am e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread
...
Merge commit 'e967ee49b5a86de2be11dd1d28283c337b01e537' into gingerbread-plus-aosp
* commit 'e967ee49b5a86de2be11dd1d28283c337b01e537':
Fix gingerbread FrameworkCoreTests makefile.
2010-08-10 10:30:32 -07:00
Maksymilian Osowski
ea46f2595a
Resets Summarizer after everything's finished.
...
Bug: 2903641
Change-Id: I7cecd454fe726a1527999259d37bd51ea2785116
2010-08-10 18:28:52 +01:00
Brett Chabot
e967ee49b5
Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread
2010-08-10 10:27:48 -07:00
James Dong
f3b7859fc9
Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
...
o Assume there is only a single output buffer containing such information.
This simplifies the logic in MP4 file writer
o Output SPS and PPS in the very first buffer for software AVC encoder
This is to make AVC encoder work with the MP4 file writer
o Add timestamp value for codec config data
Change-Id: Iad27a04579e6028332429cd0bebd30976041e997
2010-08-10 10:20:15 -07:00
Andreas Huber
aa92ef7a56
Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
...
Change-Id: I51df3b8139b3009565b2271611050700a23cf1d7
2010-08-10 10:10:40 -07:00
Jeff Hamilton
f0cfe3438a
Add a few helpful APIs.
...
Change-Id: Ie57aa71eb77a1e0fb058f4eb6f40d4144a6dfce7
2010-08-10 10:13:18 -05:00
Maksymilian Osowski
77bdba839b
Merge "Changed some parts of the code to prepare it for script support that will come in later commit."
2010-08-10 07:42:47 -07:00
Maksymilian Osowski
c8fb818b94
Changed some parts of the code to prepare it for script support that will come in later commit.
...
Bug: 2903591
Change-Id: If8fcfad1557c8140c476212d8be9f99987cdaa18
2010-08-10 14:47:53 +01:00
Mike Lockwood
ff68468f1b
Merge changes I4f117090,Ifd449c4e
...
* changes:
MTP: Push queries for supported formats and properties up to Java.
MTP: turn off verbose logging
2010-08-10 06:13:35 -07:00
Mike Lockwood
4b322ce4fb
MTP: Push queries for supported formats and properties up to Java.
...
Change-Id: I4f117090340e3916afda3d194521a6092a672ddc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-10 09:00:30 -04:00
Maksymilian Osowski
38b7eb96fd
Merge "Added generating text summary to Summarizer."
2010-08-10 05:41:40 -07:00
Steve Block
68dede3d66
Hook up mock for testing DeviceOrientation in DRT
...
Change-Id: I99fbe328807428aa0d94893545bad0697ccb71d7
2010-08-10 12:00:35 +01:00
Mike Lockwood
fb824581d7
MTP: turn off verbose logging
...
Change-Id: Ifd449c4e8c4aec6e5623869e86f8cbedd303972c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-10 06:45:46 -04:00
Maksymilian Osowski
8aff3c0571
Added eventSender.
...
Change-Id: Iae31dc11ddd7b4b1b9c2e1c39fb61cc7b9832721
2010-08-10 11:41:47 +01:00
Hung-ying Tyan
1601400b58
am f13542f2: am 259b4c86: Merge "SIP: clean up unused class and fields." into gingerbread
...
Merge commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00'
* commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00':
SIP: clean up unused class and fields.
2010-08-09 22:44:37 -07:00