The Android Automerger
655522fef5
merge in ics-mr0-release history after reset to ics-mr0
2011-10-28 09:53:33 -07:00
Scott Main
09be18a925
am 43eed003: am b44038fd: docs: platform note typo
...
* commit '43eed0039c5534e68c82f13bab448fd7dc6845f7':
docs: platform note typo
2011-10-28 16:44:31 +00:00
Scott Main
868f0128cf
am b44038fd: docs: platform note typo
...
* commit 'b44038fd294382d42070eb60df3bf5132eb4cb29':
docs: platform note typo
2011-10-28 16:39:46 +00:00
Andreas Huber
c1a72f7659
am 27ed1249: Merge "Properly report that we\'re no longer playing after receiving event" into ics-mr1
...
* commit '27ed12492dfbec6ec67b66ff3cf60febce370b01':
Properly report that we're no longer playing after receiving event
2011-10-28 16:17:54 +00:00
Andreas Huber
944d04686a
Merge "Properly report that we're no longer playing after receiving event" into ics-mr1
2011-10-28 09:13:54 -07:00
Daniel Sandler
b3bb5126a2
am ae561ae6: Merge "Fix initial Bluetooth icon state." into ics-mr1
...
* commit 'ae561ae62faf16ecd44b058ef966afd9b84feefe':
Fix initial Bluetooth icon state.
2011-10-28 13:34:22 +00:00
Daniel Sandler
3b93f94588
Merge "Fix initial Bluetooth icon state." into ics-mr1
2011-10-28 06:29:51 -07:00
Narayan Kamath
20edfb72fe
am 7a2f6f38: Merge "Widen permissions on synthesized files." into ics-mr1
...
* commit '7a2f6f38fe025654614d4c279fcfabf5819638b8':
Widen permissions on synthesized files.
2011-10-28 09:19:14 +00:00
Narayan Kamath
7916e9add9
Merge "Widen permissions on synthesized files." into ics-mr1
2011-10-28 02:15:04 -07:00
Jeff Brown
20b3da9a01
Optimize fillWindow to improve reverse-seek performance.
...
Bug: 5520301
When an application requests a row from a SQLiteCursor that
is not in the window, instead of filling from the requested
row position onwards, fill from a little bit ahead of the
requested row position.
This fixes a problem with applications that seek backwards
in large cursor windows. Previously the application could
end up refilling the window every time it moved back
one position.
We try to fill about 1/3 before the requested position and
2/3 after which substantially improves scrolling responsiveness
when the list is bound to a data set that does not fit
entirely within one cursor window.
Change-Id: I168ff1d3aed1a41ac96267be34a026c108590e52
2011-10-28 01:46:18 -07:00
Jeff Brown
991ddd13a6
am ce6578ac: am 84bee4f8: Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0
...
* commit 'ce6578acc5729f76fc93b6daafede413703a8d19':
Fix copyStringToBuffer row index calculation. Bug: 5515552
2011-10-28 08:24:11 +00:00
Jeff Brown
7175809019
am 84bee4f8: Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0
...
* commit '84bee4f8746a19428e0ddfd10df1130324dc39fa':
Fix copyStringToBuffer row index calculation. Bug: 5515552
2011-10-28 08:20:20 +00:00
Jeff Brown
a2904e6a57
Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0
2011-10-28 01:18:07 -07:00
Jim Miller
cdb564f2b1
am c1a1cca8: Merge "Fix 5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1
...
* commit 'c1a1cca866ff76a6dbfa500292593d8031908a9b':
Fix 5487180: Check for empty plmn/spn strings instead of just null
2011-10-28 07:26:05 +00:00
Jim Miller
30d35a24dc
Merge "Fix 5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1
2011-10-28 00:22:53 -07:00
Robert Greenwalt
58ca561c28
am ca50b44e: am c43b9b6d: Merge "Add SFR DUN configuration." into ics-mr0
...
* commit 'ca50b44e2f8a279a37c31dbf9571e12a1e429493':
Add SFR DUN configuration.
2011-10-28 04:10:54 +00:00
Robert Greenwalt
ada031b0c5
am c43b9b6d: Merge "Add SFR DUN configuration." into ics-mr0
...
* commit 'c43b9b6d97ed6dc40e181843aa79159c504e7004':
Add SFR DUN configuration.
2011-10-28 04:06:09 +00:00
Robert Greenwalt
21f0be6b0d
Merge "Add SFR DUN configuration." into ics-mr0
2011-10-27 21:04:17 -07:00
Peter Ng
03d03bb4a3
am 81bd76e4: Merge "Removing 2nd background clock font display from statusbar and lock screen" into ics-mr1
...
* commit '81bd76e4b33ea00d30bb2b2193ca5bd0cf445546':
Removing 2nd background clock font display from statusbar and lock screen
2011-10-28 02:53:26 +00:00
Jake Hamby
b7ce12b45d
am e3a31d03: am 31d157ba: Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0
...
* commit 'e3a31d0340802352d568c8c35ff1fa1047018a42':
Fix bug in enabling/disabling SMS cell broadcast activation.
2011-10-28 02:53:24 +00:00
Justin Ho
e0fb5f940a
am a196c688: am 9e7407ed: Merge "Increase navigation icon brightness by 10%" into ics-mr0
...
* commit 'a196c688ed1c8aa92d711b53c4dabd7d1399e740':
Increase navigation icon brightness by 10%
2011-10-28 02:53:23 +00:00
Justin Ho
6ba9e79cfc
am 64653ac2: am e7ff3906: Merge "Increase notification icon brightness" into ics-mr0
...
* commit '64653ac2fa32a679f0695495764146a4be47897e':
Increase notification icon brightness
2011-10-28 02:53:21 +00:00
Jamie Gennis
adabad326e
am fc9592f8: am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
...
* commit 'fc9592f8a5f2f75207e5e532655ac294eb2b334b':
Stagefright: ANW::connect in MediaPlayerService
2011-10-28 02:53:20 +00:00
Robert Greenwalt
130f05fa2f
am 859bf0f2: am 81433a38: Merge "Temp disable Tethering if DUN is required" into ics-mr0
...
* commit '859bf0f2efb7b5518055893c17aa3a6437023633':
Temp disable Tethering if DUN is required
2011-10-28 02:53:18 +00:00
Justin Ho
945f53ca44
am 1b15f7f1: (-s ours) am 28b3fd13: Merge "Correctly updating Roboto HHEA table" into ics-mr0
...
* commit '1b15f7f1abc73683fe067e4b0b00e2e5c70a6282':
Correctly updating Roboto HHEA table
2011-10-28 02:53:17 +00:00
Peter Ng
d55af7cc40
Merge "Removing 2nd background clock font display from statusbar and lock screen" into ics-mr1
2011-10-27 19:17:19 -07:00
Jake Hamby
6fc5e917ab
am 31d157ba: Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0
...
* commit '31d157bad27e4ecbe415f6f581946b6da7cc2ba3':
Fix bug in enabling/disabling SMS cell broadcast activation.
2011-10-28 02:14:08 +00:00
Justin Ho
2738256a40
am 9e7407ed: Merge "Increase navigation icon brightness by 10%" into ics-mr0
...
* commit '9e7407ed2b18800291612fb9fb355ef062801f07':
Increase navigation icon brightness by 10%
2011-10-28 02:14:05 +00:00
Justin Ho
829fc3c335
am e7ff3906: Merge "Increase notification icon brightness" into ics-mr0
...
* commit 'e7ff39066c42f66913dbe23f61478273daa30f4d':
Increase notification icon brightness
2011-10-28 02:14:04 +00:00
Jamie Gennis
d8f8870244
am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
...
* commit '08479ceeba56c460fb52f60a24df27776f1936c3':
Stagefright: ANW::connect in MediaPlayerService
2011-10-28 02:14:01 +00:00
Robert Greenwalt
57aa48b327
am 81433a38: Merge "Temp disable Tethering if DUN is required" into ics-mr0
...
* commit '81433a38784e64dbc155047a3915cf5eff32840b':
Temp disable Tethering if DUN is required
2011-10-28 02:13:59 +00:00
Justin Ho
f3d05ef9de
am 28b3fd13: Merge "Correctly updating Roboto HHEA table" into ics-mr0
...
* commit '28b3fd136d713b4d94fc72113e1ff42637374d2a':
Correctly updating Roboto HHEA table
2011-10-28 02:13:56 +00:00
Dianne Hackborn
c1ba6e240c
am ea1db611: Fix build. Forgot to add files. :(
...
* commit 'ea1db611b493d70e82641f8dc01d4a4c4ffcd3e7':
Fix build. Forgot to add files. :(
2011-10-28 02:08:18 +00:00
Dianne Hackborn
4d831c87a9
am 114ac293: Merge "New framework performance tests." into ics-mr1
...
* commit '114ac293b8df1e1db817603bcb77507451e87cd4':
New framework performance tests.
2011-10-28 01:37:40 +00:00
Dianne Hackborn
f9a31968c6
Merge "New framework performance tests." into ics-mr1
2011-10-27 18:34:04 -07:00
Daniel Sandler
e4f631be9a
am d939dd2e: Merge "Fix race condition in status bar init code." into ics-mr1
...
* commit 'd939dd2eaacbe898dc82170a4b41a7248fe182e6':
Fix race condition in status bar init code.
2011-10-28 00:59:12 +00:00
Daniel Sandler
52896a0e3d
Merge "Fix race condition in status bar init code." into ics-mr1
2011-10-27 17:54:50 -07:00
Jake Hamby
522d8b7bf8
Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0
2011-10-27 17:46:32 -07:00
The Android Automerger
7c7b114bdd
Revert "Clean up CursorWindow code."
...
This reverts commit 3bc6bbc92cd2095f42039b5aadd0a14d0e5d9230.
2011-10-27 17:42:17 -07:00
The Android Automerger
10a6f64fac
Revert "Fix regression in CursorWindow.copyStingToBuffer."
...
This reverts commit d0ff68da6a606602235fb8749473999e3d1bde53.
2011-10-27 17:41:26 -07:00
The Android Automerger
1c46edd8c6
Revert "Use ashmem for CursorWindows."
...
This reverts commit 0cde89f5f025b7826be009ebb9673b970e180e32.
2011-10-27 17:39:53 -07:00
Justin Ho
f9dc46c062
Merge "Increase navigation icon brightness by 10%" into ics-mr0
2011-10-27 16:37:02 -07:00
Justin Ho
536b586734
Merge "Increase notification icon brightness" into ics-mr0
2011-10-27 16:36:52 -07:00
Mangesh Ghiware
a940cb5ccd
am ade26e2e: Merge "Fix restore of view and text wrap scales." into ics-mr1
...
* commit 'ade26e2e383cd0041f8aa94467d119c2bd1ee5e8':
Fix restore of view and text wrap scales.
2011-10-27 23:15:58 +00:00
Mangesh Ghiware
721f5bc7aa
Merge "Fix restore of view and text wrap scales." into ics-mr1
2011-10-27 16:11:32 -07:00
Jamie Gennis
263a3a5825
Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
2011-10-27 16:04:45 -07:00
Robert Greenwalt
982beae457
Merge "Temp disable Tethering if DUN is required" into ics-mr0
2011-10-27 15:43:47 -07:00
Mathias Agopian
ae9eca5773
am 7165b92e: Merge "fix Corrupted graphics while playing You Tube on orientation change" into ics-mr1
...
* commit '7165b92e71bc6a1a741a53dc7968af88e7958f39':
fix Corrupted graphics while playing You Tube on orientation change
2011-10-27 22:41:29 +00:00
Mathias Agopian
86eb34f18e
Merge "fix Corrupted graphics while playing You Tube on orientation change" into ics-mr1
2011-10-27 15:37:33 -07:00
James Dong
4375c87a08
am da57c0e8: Merge "Report call status from AudioSource::start() to file writer" into ics-mr1
...
* commit 'da57c0e8cf7e5022dd927b51fab3c1a40a8adf54':
Report call status from AudioSource::start() to file writer
2011-10-27 22:28:08 +00:00