OSDN Git Service
The Android Open Source Project [Tue, 1 Nov 2011 21:28:57 +0000 (14:28 -0700)]
Reconcile with ics-mr0-release
Change-Id: I14f9c7648ae8cc7403a6c605d12aba8eec553e80
Mangesh Ghiware [Tue, 1 Nov 2011 21:02:05 +0000 (14:02 -0700)]
Merge "Fix setInitialScale() to take display density into account." into ics-mr1
Eric Fischer [Tue, 1 Nov 2011 20:53:14 +0000 (13:53 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Michael Jurka [Tue, 1 Nov 2011 20:53:02 +0000 (13:53 -0700)]
Merge "Fix: never show recents over lock screen" into ics-mr1
Peter Ng [Tue, 1 Nov 2011 20:45:18 +0000 (13:45 -0700)]
Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1
Fabrice Di Meglio [Tue, 1 Nov 2011 20:30:24 +0000 (13:30 -0700)]
Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1
Robert Greenwalt [Tue, 1 Nov 2011 20:29:42 +0000 (20:29 +0000)]
am
bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
* commit '
bd9b1528051a1b257768fdbc5077a2d4473b02dd':
Add cdma_rmnet4 to list of monitored interfaces
Robert Greenwalt [Tue, 1 Nov 2011 20:27:56 +0000 (13:27 -0700)]
Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
Daniel Sandler [Tue, 1 Nov 2011 20:05:41 +0000 (13:05 -0700)]
Merge "Bring timestamps back to notifications." into ics-mr1
Jim Miller [Tue, 1 Nov 2011 19:45:11 +0000 (12:45 -0700)]
Merge "Fix
5404916: Make layout fit on 480x800 hdpi device" into ics-mr1
Fabrice Di Meglio [Tue, 1 Nov 2011 19:42:48 +0000 (19:42 +0000)]
am
46e327ca: (-s ours) Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
* commit '
46e327ca32a29432941ba4487077577b10243aed':
Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
Fabrice Di Meglio [Tue, 1 Nov 2011 19:41:04 +0000 (12:41 -0700)]
Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
Mangesh Ghiware [Tue, 1 Nov 2011 18:28:01 +0000 (11:28 -0700)]
Merge "Clamp initial scale between minimum and maximum values." into ics-mr1
Adam Powell [Tue, 1 Nov 2011 17:58:58 +0000 (10:58 -0700)]
Merge "Fix bug
5534667 - Action bar icons need more space on tablet" into ics-mr1
Dianne Hackborn [Tue, 1 Nov 2011 17:42:54 +0000 (10:42 -0700)]
Merge "Various performance and other work." into ics-mr1
Peter Ng [Tue, 1 Nov 2011 17:29:25 +0000 (10:29 -0700)]
Merge "spinner focused states pumped up" into ics-mr1
The Android Open Source Project [Tue, 1 Nov 2011 17:10:39 +0000 (17:10 +0000)]
am
9eb4c891: Reconcile with ics-factoryrom-2-release
* commit '
9eb4c891a3db118f2546af7593c6251f3210f3ef':
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
The Android Open Source Project [Tue, 1 Nov 2011 17:08:14 +0000 (10:08 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
Philip Milne [Tue, 1 Nov 2011 16:30:21 +0000 (09:30 -0700)]
Merge " Update to fix for bug
5393156" into ics-mr1
The Android Automerger [Tue, 1 Nov 2011 13:28:37 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Jim Miller [Tue, 1 Nov 2011 07:49:46 +0000 (07:49 +0000)]
am
1dce37bd: Merge "Fix
5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
* commit '
1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea':
Fix
5497305: Make sure we show SIM unlock when "None" is selected
Jim Miller [Tue, 1 Nov 2011 07:47:44 +0000 (00:47 -0700)]
Merge "Fix
5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
Chih-Chung Chang [Tue, 1 Nov 2011 04:05:45 +0000 (04:05 +0000)]
am
4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '
4b6353ea0265bfed52d0637abd1b17596ce25ff0':
Update camera continuous autofocus javadoc.
Chih-Chung Chang [Tue, 1 Nov 2011 04:04:01 +0000 (21:04 -0700)]
Merge "Update camera continuous autofocus javadoc." into ics-mr0
satok [Tue, 1 Nov 2011 01:20:48 +0000 (18:20 -0700)]
Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1
Adam Powell [Tue, 1 Nov 2011 01:18:33 +0000 (18:18 -0700)]
Merge "Fix bug
5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1
Stephen Hines [Tue, 1 Nov 2011 00:16:56 +0000 (00:16 +0000)]
am
af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0
* commit '
af675222f6340a8a9edbe9e8635014a18521e5e0':
Fix potential segfault in RS watchdog.
Stephen Hines [Tue, 1 Nov 2011 00:14:58 +0000 (17:14 -0700)]
Merge "Fix potential segfault in RS watchdog." into ics-mr0
The Android Automerger [Mon, 31 Oct 2011 23:47:11 +0000 (16:47 -0700)]
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit
2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to
2cc1c5d067736f221554be593c2ba2c96390f847.
Eric Laurent [Mon, 31 Oct 2011 23:23:15 +0000 (23:23 +0000)]
am
6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0
* commit '
6e91e5b689a3eb8e6a6f3c038322b8044a9d6670':
Fix volume indication in vibrate mode.
Eric Laurent [Mon, 31 Oct 2011 23:21:16 +0000 (16:21 -0700)]
Merge "Fix volume indication in vibrate mode." into ics-mr0
Martijn Coenen [Mon, 31 Oct 2011 22:54:43 +0000 (22:54 +0000)]
am
1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0
* commit '
1eca250b9dad45893fead128539f112cbc513496':
Fix disableForegroundNdefPush crash.
Martijn Coenen [Mon, 31 Oct 2011 22:53:08 +0000 (15:53 -0700)]
Merge "Fix disableForegroundNdefPush crash." into ics-mr0
Pannag Sanketi [Mon, 31 Oct 2011 22:05:19 +0000 (15:05 -0700)]
Merge "Expose video stabilization API" into ics-mr1
Svetoslav Ganov [Mon, 31 Oct 2011 20:30:30 +0000 (20:30 +0000)]
am
aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
* commit '
aeb11b598877523fd3c530c7a086c38b4a13c7a1':
Folding Accessibility Service sample into ApiDemos.
Svetoslav Ganov [Mon, 31 Oct 2011 20:28:57 +0000 (13:28 -0700)]
Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
The Android Open Source Project [Mon, 31 Oct 2011 20:06:22 +0000 (13:06 -0700)]
Reconcile with ics-mr0-release
Change-Id: Ice28e0b55ab17842c9bd01b519b7f4d562822445
Tom Taylor [Mon, 31 Oct 2011 19:51:19 +0000 (12:51 -0700)]
Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1
The Android Open Source Project [Mon, 31 Oct 2011 19:45:33 +0000 (19:45 +0000)]
am
50d0511d: Reconcile with ics-factoryrom-2-release
* commit '
50d0511ddbf226255347e95a6382af8b0e7d366b':
Revert "Improve the slow query instrumentation."
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
The Android Open Source Project [Mon, 31 Oct 2011 19:43:39 +0000 (12:43 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: Ic64060bceb7aef3ab5958a8b404e64526f794662
Adam Powell [Mon, 31 Oct 2011 19:37:58 +0000 (12:37 -0700)]
Merge "Bug
5535639 - Monkeys mad at FragmentManager" into ics-mr1
Winson Chung [Mon, 31 Oct 2011 17:54:12 +0000 (10:54 -0700)]
Merge "Using fast-invalidate pattern for screenshot animations." into ics-mr1
Marco Nelissen [Mon, 31 Oct 2011 17:46:33 +0000 (10:46 -0700)]
Merge "Make MediaController use low profile system UI" into ics-mr1
Alex Sakhartchouk [Mon, 31 Oct 2011 17:30:37 +0000 (10:30 -0700)]
Merge "Removing changes not meant for MR1" into ics-mr1
Michael Jurka [Mon, 31 Oct 2011 02:41:24 +0000 (19:41 -0700)]
Merge "HorizontalScrollView should delay child presses" into ics-mr1
Amith Yamasani [Sun, 30 Oct 2011 21:37:09 +0000 (21:37 +0000)]
am
69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
* commit '
69e640ee84fc218d6318acaf73a1c1841d7fba6b':
Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
Jeff Brown [Sun, 30 Oct 2011 21:24:02 +0000 (14:24 -0700)]
resolved conflicts for merge of
2d280f75 to ics-mr1
Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
The Android Automerger [Sun, 30 Oct 2011 20:56:11 +0000 (13:56 -0700)]
Revert "Improve the slow query instrumentation."
This reverts commit
89101cd9d9b5c1a6ff1ed85eba0613ca4c4802e2.
The Android Automerger [Sun, 30 Oct 2011 19:35:09 +0000 (12:35 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Sun, 30 Oct 2011 13:29:10 +0000 (06:29 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sat, 29 Oct 2011 03:40:07 +0000 (20:40 -0700)]
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit
2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to
2cc1c5d067736f221554be593c2ba2c96390f847.
Eric Fischer [Sat, 29 Oct 2011 03:15:36 +0000 (03:15 +0000)]
am
2cc1c5d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
2cc1c5d067736f221554be593c2ba2c96390f847':
Import revised translations. DO NOT MERGE
Scott Main [Sat, 29 Oct 2011 02:16:15 +0000 (02:16 +0000)]
am
8dbe177c: Merge "docs: fix spell checker client location" into ics-mr0
* commit '
8dbe177c5dda205086f7a353dd1fa09a0c7ab24c':
docs: fix spell checker client location
Joe Fernandez [Sat, 29 Oct 2011 02:16:10 +0000 (02:16 +0000)]
am
09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
* commit '
09848bc89de999416e2de82a7693b2deec6bf802':
docs: add developer guide cross references, Project ACRE, round 3
Justin Ho [Sat, 29 Oct 2011 02:16:08 +0000 (02:16 +0000)]
am
c1cf3b16: Merge "Vertically center the landscape navigation bar." into ics-mr0
* commit '
c1cf3b160b4852e021a45806d496a9f9a76d6683':
Vertically center the landscape navigation bar.
Amith Yamasani [Sat, 29 Oct 2011 01:59:11 +0000 (18:59 -0700)]
Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
satok [Sat, 29 Oct 2011 01:26:40 +0000 (18:26 -0700)]
Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1
satok [Sat, 29 Oct 2011 01:25:28 +0000 (18:25 -0700)]
Merge "Hide ime switcher when the screen is turned off." into ics-mr1
Jeff Brown [Sat, 29 Oct 2011 01:21:05 +0000 (18:21 -0700)]
Merge "Improve the slow query instrumentation." into ics-mr0
Dianne Hackborn [Sat, 29 Oct 2011 00:33:39 +0000 (17:33 -0700)]
Merge "Add some IO tests." into ics-mr1
Eric Fischer [Sat, 29 Oct 2011 00:29:12 +0000 (17:29 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Scott Main [Fri, 28 Oct 2011 22:57:45 +0000 (15:57 -0700)]
Merge "docs: fix spell checker client location" into ics-mr0
Joe Fernandez [Fri, 28 Oct 2011 22:40:11 +0000 (15:40 -0700)]
Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
Peter Ng [Fri, 28 Oct 2011 22:20:56 +0000 (15:20 -0700)]
Merge "Stat_notify visual asset updates" into ics-mr1
Peter Ng [Fri, 28 Oct 2011 22:20:27 +0000 (15:20 -0700)]
Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1
Chet Haase [Fri, 28 Oct 2011 22:13:27 +0000 (15:13 -0700)]
Merge "Optimize handling of scrolled wallpapers" into ics-mr1
Justin Ho [Fri, 28 Oct 2011 22:01:19 +0000 (15:01 -0700)]
Merge "Vertically center the landscape navigation bar." into ics-mr0
Jeff Brown [Fri, 28 Oct 2011 04:24:54 +0000 (21:24 -0700)]
Improve the slow query instrumentation.
On user-debug and eng builds, you can set the
"db.log.slow_query_threshold" system property to queries that
take longer than the specified number of milliseconds.
Set it to 0 to log all queries.
This property has been around for a while but it was implemented
poorly. In particular, it *changed* the behavior of the query
by calling getCount() while holding the Db connection.
In normal operation, the query will not actually run until later.
By putting the timing logic into fillWindow() instead, we ensure
that we only measure queries that actually ran. We also capture
cases where the cursor window gets filled multiple times.
Bug:
5520301
Change-Id: I174f5e1ea15831a1d22a36e9a804d7755f230b38
Svetoslav Ganov [Fri, 28 Oct 2011 21:20:52 +0000 (14:20 -0700)]
Merge "Fixing a memory leak in accessibility enteraction APIs." into ics-mr1
Eric Fischer [Fri, 28 Oct 2011 20:59:31 +0000 (13:59 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Gilles Debunne [Fri, 28 Oct 2011 20:44:17 +0000 (20:44 +0000)]
am
4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0
* commit '
4eec98edee3d6eb516e30a7151da13fd726f93a9':
Text handles do not handle scroll correctly
Gilles Debunne [Fri, 28 Oct 2011 20:41:01 +0000 (13:41 -0700)]
Merge "Text handles do not handle scroll correctly" into ics-mr0
The Android Open Source Project [Fri, 28 Oct 2011 20:05:26 +0000 (13:05 -0700)]
Reconcile with ics-mr0-release
Change-Id: I6997b52967863156cd151e368e891b63024ebbb1
Jeff Sharkey [Fri, 28 Oct 2011 19:24:44 +0000 (12:24 -0700)]
Merge "Differentiate between system_server and unknown." into ics-mr1
Daniel Sandler [Fri, 28 Oct 2011 19:21:22 +0000 (12:21 -0700)]
Merge "Tuning parameters for mobile RSSI." into ics-mr1
Raphael [Fri, 28 Oct 2011 18:54:36 +0000 (18:54 +0000)]
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.
Peter Ng [Fri, 28 Oct 2011 17:53:54 +0000 (10:53 -0700)]
Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
Adam Powell [Fri, 28 Oct 2011 17:43:33 +0000 (10:43 -0700)]
Merge "Add API for deferring fragment start." into ics-mr1
The Android Automerger [Fri, 28 Oct 2011 16:53:33 +0000 (09:53 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Scott Main [Fri, 28 Oct 2011 16:39:46 +0000 (16:39 +0000)]
am
b44038fd: docs: platform note typo
* commit '
b44038fd294382d42070eb60df3bf5132eb4cb29':
docs: platform note typo
Andreas Huber [Fri, 28 Oct 2011 16:13:54 +0000 (09:13 -0700)]
Merge "Properly report that we're no longer playing after receiving event" into ics-mr1
Daniel Sandler [Fri, 28 Oct 2011 13:29:51 +0000 (06:29 -0700)]
Merge "Fix initial Bluetooth icon state." into ics-mr1
Narayan Kamath [Fri, 28 Oct 2011 09:15:04 +0000 (02:15 -0700)]
Merge "Widen permissions on synthesized files." into ics-mr1
Jeff Brown [Fri, 28 Oct 2011 08:20:20 +0000 (08:20 +0000)]
am
84bee4f8: Merge "Fix copyStringToBuffer row index calculation. Bug:
5515552" into ics-mr0
* commit '
84bee4f8746a19428e0ddfd10df1130324dc39fa':
Fix copyStringToBuffer row index calculation. Bug:
5515552
Jeff Brown [Fri, 28 Oct 2011 08:18:07 +0000 (01:18 -0700)]
Merge "Fix copyStringToBuffer row index calculation. Bug:
5515552" into ics-mr0
Jim Miller [Fri, 28 Oct 2011 07:22:53 +0000 (00:22 -0700)]
Merge "Fix
5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1
Robert Greenwalt [Fri, 28 Oct 2011 04:06:09 +0000 (04:06 +0000)]
am
c43b9b6d: Merge "Add SFR DUN configuration." into ics-mr0
* commit '
c43b9b6d97ed6dc40e181843aa79159c504e7004':
Add SFR DUN configuration.
Robert Greenwalt [Fri, 28 Oct 2011 04:04:17 +0000 (21:04 -0700)]
Merge "Add SFR DUN configuration." into ics-mr0
Peter Ng [Fri, 28 Oct 2011 02:17:19 +0000 (19:17 -0700)]
Merge "Removing 2nd background clock font display from statusbar and lock screen" into ics-mr1
Jake Hamby [Fri, 28 Oct 2011 02:14:08 +0000 (02:14 +0000)]
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.
Justin Ho [Fri, 28 Oct 2011 02:14:05 +0000 (02:14 +0000)]
am
9e7407ed: Merge "Increase navigation icon brightness by 10%" into ics-mr0
* commit '
9e7407ed2b18800291612fb9fb355ef062801f07':
Increase navigation icon brightness by 10%
Justin Ho [Fri, 28 Oct 2011 02:14:04 +0000 (02:14 +0000)]
am
e7ff3906: Merge "Increase notification icon brightness" into ics-mr0
* commit '
e7ff39066c42f66913dbe23f61478273daa30f4d':
Increase notification icon brightness
Jamie Gennis [Fri, 28 Oct 2011 02:14:01 +0000 (02:14 +0000)]
am
08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
* commit '
08479ceeba56c460fb52f60a24df27776f1936c3':
Stagefright: ANW::connect in MediaPlayerService
Robert Greenwalt [Fri, 28 Oct 2011 02:13:59 +0000 (02:13 +0000)]
am
81433a38: Merge "Temp disable Tethering if DUN is required" into ics-mr0
* commit '
81433a38784e64dbc155047a3915cf5eff32840b':
Temp disable Tethering if DUN is required
Justin Ho [Fri, 28 Oct 2011 02:13:56 +0000 (02:13 +0000)]
am
28b3fd13: Merge "Correctly updating Roboto HHEA table" into ics-mr0
* commit '
28b3fd136d713b4d94fc72113e1ff42637374d2a':
Correctly updating Roboto HHEA table
Dianne Hackborn [Fri, 28 Oct 2011 01:34:04 +0000 (18:34 -0700)]
Merge "New framework performance tests." into ics-mr1
Daniel Sandler [Fri, 28 Oct 2011 00:54:50 +0000 (17:54 -0700)]
Merge "Fix race condition in status bar init code." into ics-mr1
Jake Hamby [Fri, 28 Oct 2011 00:46:32 +0000 (17:46 -0700)]
Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0
The Android Automerger [Fri, 28 Oct 2011 00:42:17 +0000 (17:42 -0700)]
Revert "Clean up CursorWindow code."
This reverts commit
3bc6bbc92cd2095f42039b5aadd0a14d0e5d9230.
The Android Automerger [Fri, 28 Oct 2011 00:41:26 +0000 (17:41 -0700)]
Revert "Fix regression in CursorWindow.copyStingToBuffer."
This reverts commit
d0ff68da6a606602235fb8749473999e3d1bde53.
OSDN Git Service
