James Dong
000c40f6cc
am 27d4ad2a: (-s ours) am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
...
* commit '27d4ad2a5771ad025fa69f64b093d7429d94bfd3':
Expose AMRNB/WB and AAC encoder and related file output formats - do not merge
2010-12-22 12:44:22 -08:00
James Dong
e5a94699e1
am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
...
* commit '2bf89b2197674ccc414ea60a61199562df9dc52b':
Expose AMRNB/WB and AAC encoder and related file output formats - do not merge
2010-12-22 12:40:57 -08:00
James Dong
7bc0c0a8b7
Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
2010-12-22 12:38:11 -08:00
Dianne Hackborn
a0d276683f
Merge "Fix issue #3194697 : default orientation for portrait-mode apps on stingray is backward?"
2010-12-22 12:33:40 -08:00
Mattias Petersson
96dcf8ef1f
am 2f209e88: am 1622eee2: Improve performance of WindowState.toString()
...
* commit '2f209e885a86b8396fe1344043cf9858751fcb64':
Improve performance of WindowState.toString()
2010-12-22 12:04:43 -08:00
Jeff Hamilton
83f509e3cf
am 7a9f17c3: am 3ce86481: Remove canBeFormatted().
...
* commit '7a9f17c3563be3eb5fc0927e20d9bc7ec09e20c3':
Remove canBeFormatted().
2010-12-22 12:04:32 -08:00
James Dong
559810e779
Merge "Avoid using private Bitmap constructor to generate bitmaps"
2010-12-22 12:03:39 -08:00
Hung-ying Tyan
1ec8d0dd0c
am aec9a33f: am e0bd2688: Merge "Check if VoIP API is supported in SipManager." into gingerbread
...
* commit 'aec9a33f1cfc7c32690bc8e24aefaeb137ab9859':
Check if VoIP API is supported in SipManager.
2010-12-22 11:35:14 -08:00
Robert Greenwalt
3aefb532a4
am 46f98746: am 5d0fafe8: Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
...
* commit '46f987465c1df4ec984e725747d4d79fc592abb7':
Be sure and report NO_CONNECTIVITY when needed.
2010-12-22 11:35:06 -08:00
Dianne Hackborn
1c2601251d
am 20c915d8: am 5261cea2: Merge "Fix issue #3224616 : TimeUtils.formatDuration() can drop 0s." into gingerbread
...
* commit '20c915d80356859d8716f014a7d4950f06c38cfc':
Fix issue #3224616 : TimeUtils.formatDuration() can drop 0s.
2010-12-22 11:34:59 -08:00
Jean-Baptiste Queru
dba1337896
am b3177c13: (-s ours) am 749c627f: Merge "Support for KSC5601 on SIM."
...
* commit 'b3177c135bb7a3db3318893335a9ac0bc39d9cf8':
Support for KSC5601 on SIM.
2010-12-22 11:34:50 -08:00
Simon Wilson
2cbb0230e7
am 490db31b: (-s ours) am 0c8ad64d: Merge "fix [3127755] Launcher is missing anti-aliasing" into gingerbread
...
* commit '490db31b851af9195f8f5bd4c5b21f59be56b207':
fix [3127755] Launcher is missing anti-aliasing
2010-12-22 11:29:07 -08:00
Mattias Petersson
de0fd15bdc
am 1622eee2: Improve performance of WindowState.toString()
...
* commit '1622eee2e48678b17a4668641957f09213f98905':
Improve performance of WindowState.toString()
2010-12-22 11:25:32 -08:00
Dianne Hackborn
0ca8fbb1cc
Merge "Improve performance of WindowState.toString()"
2010-12-22 11:21:21 -08:00
Andreas Huber
2d0e696dea
Merge "Distinguish discontinuities w/ a format change from those without."
2010-12-22 10:17:03 -08:00
Jeff Hamilton
044c2f2606
am 3ce86481: Remove canBeFormatted().
...
* commit '3ce86481cbde92e2cb6fe3a46cbedd8b2a5c4b48':
Remove canBeFormatted().
2010-12-22 09:42:16 -08:00
Ben Murdoch
43c5c36579
Merge "Create a better placeholder for YT videos when flash is not installed."
2010-12-22 09:04:02 -08:00
Chet Haase
51857e8012
Merge "Account for background drawable size changing when lrtb properties change"
2010-12-22 07:12:24 -08:00
Pravat Dalbehera
d1dff8d4d4
Fix for writing empty strings to Parcel::writeString8()
...
If writeString8 is called with the following sequence:
writeString8(String8(""));
writeString8(String8("TempString"));
Then in the readString8, the 2nd String i.e. "TempString" is not read,
instead an empty string is read.
The bug comes because of the write call for String8("") where there are
no String bytes present. In the write Statement, an extra ‘\0’ is
written. During the Marshalling, Following bytes are written:
1 2 3 4 5 ...
0x0 0x0 0xB ‘T’ ‘e’ ...
The readString8 function has a check that, if String length is 0, don’t
read anything. So the first byte is read as the length for the first
string. The second byte i.e. ‘\0’ is read as the length for the second
string and hence the second string becomes empty too.
Change-Id: Id7acc0c80ae16e77be4331f1ddf69ea87e758420
2010-12-22 12:57:31 +01:00
Dianne Hackborn
921b5f5c90
Merge "Fix issue #3263026 : Screen rotation animation is funky..."
2010-12-21 23:24:50 -08:00
satok
50d57bda92
Merge "Fix NPE when the shortcut subtype was not found."
2010-12-21 23:09:38 -08:00
Dianne Hackborn
26ce184b06
Merge "Gah forgot this."
2010-12-21 19:21:41 -08:00
Dianne Hackborn
e11bf37bfa
Merge "Rework how recent tasks are added."
2010-12-21 19:07:38 -08:00
Hung-ying Tyan
aec78ca5a9
am e0bd2688: Merge "Check if VoIP API is supported in SipManager." into gingerbread
...
* commit 'e0bd2688ebc68402fb848efb5d307dba19c6a30c':
Check if VoIP API is supported in SipManager.
2010-12-21 18:36:55 -08:00
Hung-ying Tyan
6777b7fea3
Merge "Check if VoIP API is supported in SipManager." into gingerbread
2010-12-21 18:34:15 -08:00
Jeff Brown
a3bc59cceb
Merge "Add support for forward delete key."
2010-12-21 18:12:33 -08:00
Jeff Brown
33e6ad5652
Merge "Support invoking key shortcuts using Control."
2010-12-21 17:41:40 -08:00
Jake Hamby
8bb625cc23
Merge "Add EXTRA_LOCAL_ROLE to Pan State change intent."
2010-12-21 16:55:04 -08:00
Alex Sakhartchouk
f06688c341
Merge "API cleanup for renderscript. This will be a multiproject commit."
2010-12-21 16:51:52 -08:00
Gilles Debunne
40cb71c988
Merge "Links are clickable in TextView when textIsSelectable."
2010-12-21 16:10:20 -08:00
Robert Greenwalt
200af56501
am 5d0fafe8: Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
...
* commit '5d0fafe80752ad4e40fe0ec2bc06c43e669a0612':
Be sure and report NO_CONNECTIVITY when needed.
2010-12-21 16:06:19 -08:00
Robert Greenwalt
374504c059
Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
2010-12-21 16:02:13 -08:00
Andreas Huber
9edf1423b7
Merge "Better handling of forming absolute https URLs, runtime error on https:// access."
2010-12-21 14:51:44 -08:00
Amith Yamasani
9cec92d8ff
Merge "No frame and margins for dialog style preference screens."
2010-12-21 14:34:30 -08:00
Dianne Hackborn
23579789de
am 5261cea2: Merge "Fix issue #3224616 : TimeUtils.formatDuration() can drop 0s." into gingerbread
...
* commit '5261cea2e0cd61801e102114039a19ab449b53fe':
Fix issue #3224616 : TimeUtils.formatDuration() can drop 0s.
2010-12-21 13:33:06 -08:00
Dianne Hackborn
0c6568615a
Merge "Fix issue #3224616 : TimeUtils.formatDuration() can drop 0s." into gingerbread
2010-12-21 13:27:15 -08:00
Xia Wang
7bd0bf36d9
Merge "Few changes for Wi-Fi Stress Test"
2010-12-21 13:13:42 -08:00
Jesse Wilson
3c5589a2f9
Merge "Remove unused performance tests."
2010-12-21 12:22:08 -08:00
Jean-Baptiste Queru
864530d1c6
am 749c627f: Merge "Support for KSC5601 on SIM."
...
* commit '749c627fc0f30dd3db051f22f20b69a51dc19e59':
Support for KSC5601 on SIM.
2010-12-21 12:05:04 -08:00
Dianne Hackborn
4f03c5d1a6
Merge "Fix issue #3301572 : onCreateLoader must not be a member class: VolumeMetadataLoader"
2010-12-21 11:15:39 -08:00
Xavier Ducrohet
02486c52c6
Merge "LayoutLib: Misc rendering fixes."
2010-12-21 10:48:29 -08:00
Xavier Ducrohet
456bbbe78d
Merge "LayoutLib: support for Path and BitmapShader using delegates."
2010-12-21 10:47:48 -08:00
Andreas Huber
5926d0efd9
Merge "Squashed commit of the following:"
2010-12-21 10:47:34 -08:00
James Dong
7c3db5fa7c
Merge "Add more debugging code to track down hang during video recording"
2010-12-21 10:47:17 -08:00
Jean-Baptiste Queru
decfba4df7
Merge "Support for KSC5601 on SIM."
2010-12-21 10:27:14 -08:00
Vasu Nori
bff5df168c
Merge "resubmitting Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9"
2010-12-21 10:12:16 -08:00
Vasu Nori
11dde1100d
resubmitting Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9
...
Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9 was reverted
due to a bug. fixed the bug and resubmitting it here
2010-12-21 09:32:36 -08:00
Patrick Dubroy
a76a804521
Merge "Ensure bitmaps aren't freed while referenced from a display list"
2010-12-20 17:15:31 -08:00
Huahui Wu
cab43805b4
Merge "Revert "Merge "Send proxy changes on the webcore thread to WebKit"""
2010-12-20 15:03:04 -08:00
Jason Sams
67f8dd80d6
Merge "Clean up Allocation buffer object api."
2010-12-20 14:28:52 -08:00