The Android Open Source Project
3700e5336d
am 58ba1b61: Reconcile with ics-mr0-release
...
* commit '58ba1b6121a9f11bc1ba40eb5b267033bbf2fafb':
Revert "Clean up CursorWindow code."
Revert "Restore broken CursorWindow.getType behavior."
Revert "Clean up CursorWindow lifetime."
Revert "Fix regression in CursorWindow.copyStingToBuffer."
Revert "Fix regression in CursorWindow.getString()"
Revert "Clean up handrolled Binder proxies."
Revert "Fix ownership of CursorWindows across processes."
Revert "Use ashmem for CursorWindows."
2011-10-28 22:27:47 +00:00
Jeff Sharkey
7bfe20fc49
am cc16024f: Merge "Differentiate between system_server and unknown." into ics-mr1
...
* commit 'cc16024f101c0fca211fcd069b3917becf7a3c00':
Differentiate between system_server and unknown.
2011-10-28 22:27:38 +00:00
Daniel Sandler
b41304bea2
am 4c7926fa: Merge "Tuning parameters for mobile RSSI." into ics-mr1
...
* commit '4c7926fa27dacb92c8c7f3d57c4a3713dc0e3867':
Tuning parameters for mobile RSSI.
2011-10-28 22:27:37 +00:00
Raphael
6d7b43aa53
am 48ba4139: (-s ours) am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge.
...
* commit '48ba4139b9dc1f53f996b71f509a9d0c6fd2d72b':
Cherry-pick f51125d from master to ics-mr0. do not merge.
2011-10-28 22:27:22 +00:00
Peter Ng
cc3ba99e43
am 63dd319e: Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
...
* commit '63dd319ebeea0421f8bf901b85b753dde1de74d7':
Lockscreen on tablet is now using the same waveview widget as phone
2011-10-28 22:27:13 +00:00
Adam Powell
500a165fdf
am 65793dc0: Merge "Add API for deferring fragment start." into ics-mr1
...
* commit '65793dc043eee43790137f79beeba7ed8b123902':
Add API for deferring fragment start.
2011-10-28 22:27:12 +00:00
Gilles Debunne
e9a61ff202
Merge "Performance improvement in TextView"
2011-10-28 15:26:22 -07:00
Gilles Debunne
bfe1328912
Merge changes I2082e3d0,Ibf8e9827
...
* changes:
Scroll performance improved in multiline TextEdit
Performance improvements for long text edition.
2011-10-28 15:26:07 -07:00
Mark Wagner
afc8be9b9a
Merge "bugfix 5513340 Insertion pointer (vertical beam) behaves oddly in Talk's message composition field"
2011-10-28 15:16:37 -07:00
The Android Open Source Project
d211a99952
Reconcile with ics-mr0-release
...
Change-Id: I6997b52967863156cd151e368e891b63024ebbb1
2011-10-28 13:05:27 -07:00
Jeff Sharkey
eea1d1a382
Merge "Differentiate between system_server and unknown." into ics-mr1
2011-10-28 12:24:44 -07:00
Daniel Sandler
3be100bcac
Merge "Tuning parameters for mobile RSSI." into ics-mr1
2011-10-28 12:21:22 -07:00
Eric Fischer
25111da19d
Merge "Import revised translations."
2011-10-28 12:10:44 -07:00
Glenn Kasten
4ba861f6d2
Merge "Bug 5522189 temporary workaround"
2011-10-28 11:57:56 -07:00
Raphael
7118ea707b
am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge.
...
* commit 'fe9a2a5471616a3267b30013bce36b13a455c0cd':
Cherry-pick f51125d from master to ics-mr0. do not merge.
2011-10-28 18:54:36 +00:00
Jeff Brown
4047d62426
Merge "Optimize fillWindow to improve reverse-seek performance. Bug: 5520301"
2011-10-28 11:52:01 -07:00
Xavier Ducrohet
7a362f0406
Merge "AAPT fix printf %zd crash on Windows."
2011-10-28 11:28:20 -07:00
Peter Ng
ff05f3f03d
Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
2011-10-28 10:53:54 -07:00
Adam Powell
c57268ee93
Merge "Add API for deferring fragment start." into ics-mr1
2011-10-28 10:43:33 -07:00
Gilles Debunne
c647307a92
Merge "Cleaning and new constant in ViewConfiguration"
2011-10-28 10:08:32 -07:00
Gilles Debunne
b7267137c3
Merge "Revert "Potential thread concurrency issue with WordIterators.""
2011-10-28 10:08:22 -07:00
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