OSDN Git Service
The Android Automerger [Wed, 2 Nov 2011 17:05:33 +0000 (10:05 -0700)]
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit
2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to
2cc1c5d067736f221554be593c2ba2c96390f847.
The Android Automerger [Wed, 2 Nov 2011 16:48:55 +0000 (09:48 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
Irfan Sheriff [Wed, 2 Nov 2011 04:15:26 +0000 (21:15 -0700)]
Merge "Specify component name for provisioning" into ics-mr0
Jeff Sharkey [Wed, 2 Nov 2011 04:14:35 +0000 (21:14 -0700)]
Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
Katie McCormick [Wed, 2 Nov 2011 00:09:44 +0000 (17:09 -0700)]
Merge "Doc Update: Update list of widget classes" into ics-mr0
Dima Zavin [Tue, 1 Nov 2011 22:29:42 +0000 (15:29 -0700)]
Merge "BatteryService(jni): properly handle read's return value" into ics-mr0
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
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
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
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:04:01 +0000 (21:04 -0700)]
Merge "Update camera continuous autofocus javadoc." into ics-mr0
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:21:16 +0000 (16:21 -0700)]
Merge "Fix volume indication in vibrate mode." into ics-mr0
Martijn Coenen [Mon, 31 Oct 2011 22:53:08 +0000 (15:53 -0700)]
Merge "Fix disableForegroundNdefPush crash." into ics-mr0
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 19:43:39 +0000 (12:43 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: Ic64060bceb7aef3ab5958a8b404e64526f794662
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 [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.
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
Jeff Brown [Sat, 29 Oct 2011 01:21:05 +0000 (18:21 -0700)]
Merge "Improve the slow query instrumentation." into ics-mr0
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
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
Gilles Debunne [Fri, 28 Oct 2011 20:41:01 +0000 (13:41 -0700)]
Merge "Text handles do not handle scroll correctly" into ics-mr0
Jeff Brown [Fri, 28 Oct 2011 08:18:07 +0000 (01:18 -0700)]
Merge "Fix copyStringToBuffer row index calculation. Bug:
5515552" into ics-mr0
Robert Greenwalt [Fri, 28 Oct 2011 04:04:17 +0000 (21:04 -0700)]
Merge "Add SFR DUN configuration." into ics-mr0
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
Justin Ho [Thu, 27 Oct 2011 23:37:02 +0000 (16:37 -0700)]
Merge "Increase navigation icon brightness by 10%" into ics-mr0
Justin Ho [Thu, 27 Oct 2011 23:36:52 +0000 (16:36 -0700)]
Merge "Increase notification icon brightness" into ics-mr0
Jamie Gennis [Thu, 27 Oct 2011 23:04:45 +0000 (16:04 -0700)]
Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
Robert Greenwalt [Thu, 27 Oct 2011 22:43:47 +0000 (15:43 -0700)]
Merge "Temp disable Tethering if DUN is required" into ics-mr0
Justin Ho [Thu, 27 Oct 2011 22:26:42 +0000 (15:26 -0700)]
Merge "Correctly updating Roboto HHEA table" into ics-mr0
Bart Sears [Thu, 27 Oct 2011 22:20:12 +0000 (15:20 -0700)]
Merge "Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list" into ics-mr0
Eric Fischer [Thu, 27 Oct 2011 20:59:51 +0000 (13:59 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Robert Greenwalt [Thu, 27 Oct 2011 20:20:15 +0000 (13:20 -0700)]
Merge "Fix Tethering settings." into ics-mr0
Scott Main [Thu, 27 Oct 2011 18:04:46 +0000 (11:04 -0700)]
Merge "docs: change calendar overview to recommend using data URI instead of MIME type for event intents" into ics-mr0
satok [Thu, 27 Oct 2011 17:50:14 +0000 (10:50 -0700)]
Merge "Add a path to HelloSpellChecker sample application for SDK build" into ics-mr0
Scott Main [Thu, 27 Oct 2011 17:03:10 +0000 (10:03 -0700)]
Merge "docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc" into ics-mr0
Scott Main [Thu, 27 Oct 2011 15:49:48 +0000 (08:49 -0700)]
Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0
Mike Lockwood [Thu, 27 Oct 2011 13:49:12 +0000 (06:49 -0700)]
Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0
Jaikumar Ganesh [Wed, 26 Oct 2011 23:19:13 +0000 (16:19 -0700)]
Merge "Fix auto connection of headset profile." into ics-mr0
Justin Ho [Wed, 26 Oct 2011 23:16:52 +0000 (16:16 -0700)]
Merge "Brighter sysbar assets Bug:
5509557" into ics-mr0
Justin Ho [Wed, 26 Oct 2011 22:22:57 +0000 (15:22 -0700)]
Merge "Updated Roboto HHEA table Bug:
5516773" into ics-mr0
Justin Ho [Wed, 26 Oct 2011 21:46:15 +0000 (14:46 -0700)]
Merge "Adding alternate sound set and corresponding mk file Bug:
5502770" into ics-mr0
Justin Ho [Wed, 26 Oct 2011 21:37:43 +0000 (14:37 -0700)]
Merge "Notification icons increased opaqueness by 10%" into ics-mr0
Eric Fischer [Wed, 26 Oct 2011 21:04:34 +0000 (14:04 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Robert Ly [Wed, 26 Oct 2011 20:50:28 +0000 (13:50 -0700)]
Merge "docs: tools/adt r15 rel notes" into ics-mr0
Jamie Gennis [Wed, 26 Oct 2011 20:33:16 +0000 (13:33 -0700)]
Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
Bart Sears [Wed, 26 Oct 2011 07:08:59 +0000 (00:08 -0700)]
Merge "Fix power key handling after volume change. Bug:
5497716" into ics-mr0
Dianne Hackborn [Tue, 25 Oct 2011 22:25:21 +0000 (15:25 -0700)]
Merge "Fix issue #
5508024: Rotation jank seen in live wallpapers" into ics-mr0
Justin Ho [Tue, 25 Oct 2011 21:28:29 +0000 (14:28 -0700)]
Merge "Update Prime keyboard feedback sounds Tune notification sound Hojus Bug:
5416299" into ics-mr0
Mike Lockwood [Tue, 25 Oct 2011 14:02:52 +0000 (07:02 -0700)]
Merge "Reset cached light sensor values when toggling auto-brightness mode" into ics-mr0
Mike Lockwood [Tue, 25 Oct 2011 14:02:45 +0000 (07:02 -0700)]
Merge "Revert "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled."" into ics-mr0
Roman Nurik [Tue, 25 Oct 2011 13:55:59 +0000 (06:55 -0700)]
Merge "Add Q3 2011 ADL slides to docs/shareables/adl" into ics-mr0
Mike Lockwood [Tue, 25 Oct 2011 13:51:28 +0000 (06:51 -0700)]
Merge "Always use fresh NTP time for GPS" into ics-mr0
Brian Colonna [Tue, 25 Oct 2011 12:43:37 +0000 (05:43 -0700)]
Merge "Fix
5479823: black patch was showing before resuming call" into ics-mr0
Fred Quintana [Tue, 25 Oct 2011 03:36:30 +0000 (20:36 -0700)]
Merge "Fixed a bug that causes AccountManager calls to hang forever, eventually exhausting the binder threads in the gapps process, making it unusable." into ics-mr0
Eric Fischer [Mon, 24 Oct 2011 23:59:41 +0000 (16:59 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Scott Main [Mon, 24 Oct 2011 23:47:49 +0000 (16:47 -0700)]
Merge "docs: remove links to ADP devices" into ics-mr0
Jim Miller [Mon, 24 Oct 2011 20:31:15 +0000 (13:31 -0700)]
Merge "Fix
3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0
Xavier Ducrohet [Fri, 21 Oct 2011 23:18:48 +0000 (16:18 -0700)]
CherryPick f9e455 from master to mr0. do not merge.
Fix software GL renderer.
Change-Id: I7273a8e65c23a0032d155ea6572de2923791e411
Brian Colonna [Mon, 24 Oct 2011 20:19:55 +0000 (13:19 -0700)]
Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0
Peter Ng [Fri, 21 Oct 2011 23:42:49 +0000 (16:42 -0700)]
Merge "Do not merge - Recents background protection increased" into ics-mr0
Mathias Agopian [Fri, 21 Oct 2011 22:57:45 +0000 (15:57 -0700)]
Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
Eric Fischer [Fri, 21 Oct 2011 22:56:22 +0000 (15:56 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Mathias Agopian [Fri, 21 Oct 2011 22:18:28 +0000 (15:18 -0700)]
mDirtyRegion is single threaded, but could be accessed from a hwc thread
We now have mInvalidateRegion which holds the region to invalidate, it
can be set from any thread as long as mInvalidateLock is held. We use
fine-grained locking here because mInvalidateRegion can be set from anywhere,
in particular frmo HWC callbacks.
Bug:
5466774
Change-Id: Iafca20aa3f5b25a87755e65bde7b769aa8f997bc
Adam Cohen [Fri, 21 Oct 2011 20:34:46 +0000 (13:34 -0700)]
Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0
John Reck [Fri, 21 Oct 2011 20:01:48 +0000 (13:01 -0700)]
Merge changes I2df047b6,I791eeb3c into ics-mr0
* changes:
Fix rebuildWebTextView issues
DO NOT MERGE Fixed spell check failing to change word.
Dianne Hackborn [Fri, 21 Oct 2011 19:45:07 +0000 (12:45 -0700)]
Merge "Fix issue #
5342788: Setting wallpaper from gallery set default..." into ics-mr0
Dirk Dougherty [Fri, 21 Oct 2011 18:55:21 +0000 (11:55 -0700)]
Merge "Doc change: fix typo in platform highlights." into ics-mr0
Winson Chung [Fri, 21 Oct 2011 18:07:06 +0000 (11:07 -0700)]
Merge "Last update for screenshot animations for MR0. (Bug:
5333706)" into ics-mr0
Dianne Hackborn [Fri, 21 Oct 2011 18:03:34 +0000 (11:03 -0700)]
Merge "Fix issue #
5228934: IME shows up on boot, or when digits screen is tapped" into ics-mr0
Mike Lockwood [Fri, 21 Oct 2011 17:26:55 +0000 (10:26 -0700)]
Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0
Gilles Debunne [Fri, 21 Oct 2011 16:48:07 +0000 (09:48 -0700)]
Merge "Bug
5428541: Check that span is still in text before deleting" into ics-mr0
Eric Fischer [Fri, 21 Oct 2011 16:34:22 +0000 (09:34 -0700)]
Merge "Import revised translations." into ics-mr0
Mathias Agopian [Fri, 21 Oct 2011 00:45:55 +0000 (17:45 -0700)]
Merge "added dpi and refresh rate info in SF's dumpsys" into ics-mr0
Jim Miller [Fri, 21 Oct 2011 00:33:42 +0000 (17:33 -0700)]
Merge "Fix
5493266: Properly restore background after playing music" into ics-mr0
Mathias Agopian [Fri, 21 Oct 2011 00:22:38 +0000 (17:22 -0700)]
added dpi and refresh rate info in SF's dumpsys
Change-Id: I2327248eb1993689367e3daeaccba74c172dfceb
Adam Powell [Thu, 20 Oct 2011 23:25:04 +0000 (16:25 -0700)]
Merge "Bug
5275928 - Invasion of the monkeys" into ics-mr0
Irfan Sheriff [Thu, 20 Oct 2011 22:05:07 +0000 (15:05 -0700)]
Merge "Fix handling in DisconnectingState" into ics-mr0
Dirk Dougherty [Thu, 20 Oct 2011 21:32:19 +0000 (14:32 -0700)]
Merge "Doc change: minor fixes to ICS highlights." into ics-mr0
Daniel Sandler [Thu, 20 Oct 2011 20:08:36 +0000 (13:08 -0700)]
Merge "Lazily fetch the status bar service." into ics-mr0
Eric Fischer [Thu, 20 Oct 2011 18:25:44 +0000 (11:25 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
satok [Thu, 20 Oct 2011 15:42:50 +0000 (08:42 -0700)]
Merge "Update links for SampleSpellCheckerService for I938ba499" into ics-mr0
Justin Ho [Thu, 20 Oct 2011 14:25:14 +0000 (07:25 -0700)]
Merge "Add louder keypress sounds for different device configurations" into ics-mr0
Dave Burke [Thu, 20 Oct 2011 05:37:18 +0000 (22:37 -0700)]
Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
Winson Chung [Thu, 20 Oct 2011 04:36:32 +0000 (21:36 -0700)]
Merge "Updating the screenshot notification icons." into ics-mr0
Svetoslav Ganov [Thu, 20 Oct 2011 04:15:30 +0000 (21:15 -0700)]
Merge "DatePicker crashes when going from 2036 to 2035 via ▼" into ics-mr0
Jim Miller [Thu, 20 Oct 2011 03:49:33 +0000 (20:49 -0700)]
Merge "Fix
5485925: Fix crash in transport control view" into ics-mr0
Maarten Hooft [Thu, 20 Oct 2011 01:21:56 +0000 (18:21 -0700)]
Merge "Add a delay before walled garden test" into ics-mr0
Svetoslav Ganov [Thu, 20 Oct 2011 01:15:52 +0000 (18:15 -0700)]
Merge "AccessibilityServiceInfo does not report properly the feedback type." into ics-mr0
Daniel Sandler [Thu, 20 Oct 2011 01:05:20 +0000 (18:05 -0700)]
Merge "Add hasNavigationBar() to the window manager." into ics-mr0
Dirk Dougherty [Thu, 20 Oct 2011 01:05:18 +0000 (18:05 -0700)]
Merge "Doc change: add video to platform highlights and fix a few things." into ics-mr0
James Dong [Thu, 20 Oct 2011 00:55:45 +0000 (17:55 -0700)]
Merge "Check whether media recorder client exists before dumping." into ics-mr0
Dianne Hackborn [Thu, 20 Oct 2011 00:15:39 +0000 (17:15 -0700)]
Merge "Fix issue #
5484096: Device rebooted after turning WiFi tethering ON, IRL19 Crespo." into ics-mr0
Svetoslav Ganov [Wed, 19 Oct 2011 22:51:18 +0000 (15:51 -0700)]
Merge "AdapterView does not check for null adapter when initializing accessibility event." into ics-mr0