ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
40,300 Commits 2 Branches 0 Tags 54 MiB
086e2da211
Commit Graph

40300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
satok
ea11f562fc Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1 2011-10-31 18:20:48 -07:00
Adam Powell
1785ad2355 Merge "Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1 2011-10-31 18:18:33 -07:00
Stephen Hines
93b431e1e3 am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0 
* commit 'af675222f6340a8a9edbe9e8635014a18521e5e0':
  Fix potential segfault in RS watchdog.
 2011-11-01 00:16:56 +00:00
Stephen Hines
4713ddbc33 Merge "Fix potential segfault in RS watchdog." into ics-mr0 2011-10-31 17:14:58 -07:00
The Android Automerger
50a0b7c3ad Revert "Merge "Improve the slow query instrumentation." into ics-mr0" 
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
 2011-10-31 16:47:11 -07:00
Eric Laurent
b032a4f04e am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0 
* commit '6e91e5b689a3eb8e6a6f3c038322b8044a9d6670':
  Fix volume indication in vibrate mode.
 2011-10-31 23:23:15 +00:00
Eric Laurent
38b089498e Merge "Fix volume indication in vibrate mode." into ics-mr0 2011-10-31 16:21:16 -07:00
Martijn Coenen
62d73132c4 am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0 
* commit '1eca250b9dad45893fead128539f112cbc513496':
  Fix disableForegroundNdefPush crash.
 2011-10-31 22:54:43 +00:00
Martijn Coenen
e87e3dddf7 Merge "Fix disableForegroundNdefPush crash." into ics-mr0 2011-10-31 15:53:08 -07:00
Pannag Sanketi
ebb8d42602 Merge "Expose video stabilization API" into ics-mr1 2011-10-31 15:05:19 -07:00
Svetoslav Ganov
a1304a1a8e am aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 
* commit 'aeb11b598877523fd3c530c7a086c38b4a13c7a1':
  Folding Accessibility Service sample into ApiDemos.
 2011-10-31 20:30:30 +00:00
Svetoslav Ganov
89f0560d5f Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 2011-10-31 13:28:57 -07:00
The Android Open Source Project
6d43afd952 Reconcile with ics-mr0-release 
Change-Id: Ice28e0b55ab17842c9bd01b519b7f4d562822445
 2011-10-31 13:06:22 -07:00
Tom Taylor
4f8eeff7eb Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1 2011-10-31 12:51:19 -07:00
The Android Open Source Project
6936064528 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"
 2011-10-31 19:45:33 +00:00
The Android Open Source Project
76c5c69255 Reconcile with ics-factoryrom-2-release 
Change-Id: Ic64060bceb7aef3ab5958a8b404e64526f794662
 2011-10-31 12:43:39 -07:00
Adam Powell
f68912a081 Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1 2011-10-31 12:37:58 -07:00
Winson Chung
552cd78bbb Merge "Using fast-invalidate pattern for screenshot animations." into ics-mr1 2011-10-31 10:54:12 -07:00
Marco Nelissen
96ee2d9464 Merge "Make MediaController use low profile system UI" into ics-mr1 2011-10-31 10:46:33 -07:00
Alex Sakhartchouk
7b33423e8c Merge "Removing changes not meant for MR1" into ics-mr1 2011-10-31 10:30:37 -07:00
Michael Jurka
06a4fa4f52 Merge "HorizontalScrollView should delay child presses" into ics-mr1 2011-10-30 19:41:24 -07:00
Amith Yamasani
8eb8a79657 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.
 2011-10-30 21:37:09 +00:00
Jeff Brown
9897b46138 resolved conflicts for merge of 2d280f75 to ics-mr1 
Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
 2011-10-30 14:24:02 -07:00
The Android Automerger
1b47eac28c Revert "Improve the slow query instrumentation." 
This reverts commit 89101cd9d9b5c1a6ff1ed85eba0613ca4c4802e2.
 2011-10-30 13:56:11 -07:00
The Android Automerger
3186645df4 merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-10-30 12:35:09 -07:00
The Android Automerger
5b832b92d1 merge in ics-mr0-release history after reset to ics-mr0 2011-10-30 06:29:10 -07:00
The Android Automerger
30abcbd93d Revert "Merge "Improve the slow query instrumentation." into ics-mr0" 
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
 2011-10-28 20:40:07 -07:00
Eric Fischer
1e6a30e6bd am 2cc1c5d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '2cc1c5d067736f221554be593c2ba2c96390f847':
  Import revised translations.  DO NOT MERGE
 2011-10-29 03:15:36 +00:00
Scott Main
7033da0789 am 8dbe177c: Merge "docs: fix spell checker client location" into ics-mr0 
* commit '8dbe177c5dda205086f7a353dd1fa09a0c7ab24c':
  docs: fix spell checker client location
 2011-10-29 02:16:15 +00:00
Joe Fernandez
1a4fdeacfd 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
 2011-10-29 02:16:10 +00:00
Justin Ho
2c767cff58 am c1cf3b16: Merge "Vertically center the landscape navigation bar." into ics-mr0 
* commit 'c1cf3b160b4852e021a45806d496a9f9a76d6683':
  Vertically center the landscape navigation bar.
 2011-10-29 02:16:08 +00:00
Amith Yamasani
001411885a Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0 2011-10-28 18:59:11 -07:00
satok
74fcb682e7 Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1 2011-10-28 18:26:40 -07:00
satok
be8fa9fa50 Merge "Hide ime switcher when the screen is turned off." into ics-mr1 2011-10-28 18:25:28 -07:00
Jeff Brown
6d42e13be4 Merge "Improve the slow query instrumentation." into ics-mr0 2011-10-28 18:21:05 -07:00
Dianne Hackborn
9bbc1b2dfb Merge "Add some IO tests." into ics-mr1 2011-10-28 17:33:39 -07:00
Eric Fischer
5b534dcc2e Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-28 17:29:12 -07:00
Scott Main
3f89429e48 Merge "docs: fix spell checker client location" into ics-mr0 2011-10-28 15:57:45 -07:00
Joe Fernandez
d01e193b78 Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0 2011-10-28 15:40:11 -07:00
Peter Ng
89998e62b6 Merge "Stat_notify visual asset updates" into ics-mr1 2011-10-28 15:20:56 -07:00
Peter Ng
dedc016663 Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1 2011-10-28 15:20:27 -07:00
Chet Haase
0c920ffb3a Merge "Optimize handling of scrolled wallpapers" into ics-mr1 2011-10-28 15:13:27 -07:00
Justin Ho
ea99d4686c Merge "Vertically center the landscape navigation bar." into ics-mr0 2011-10-28 15:01:19 -07:00
Jeff Brown
27a852b620 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
 2011-10-28 14:58:39 -07:00
Svetoslav Ganov
d7967f79b3 Merge "Fixing a memory leak in accessibility enteraction APIs." into ics-mr1 2011-10-28 14:20:52 -07:00
Eric Fischer
b5dc4c8bb9 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-10-28 13:59:31 -07:00
Gilles Debunne
50fe8f3129 am 4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0 
* commit '4eec98edee3d6eb516e30a7151da13fd726f93a9':
  Text handles do not handle scroll correctly
 2011-10-28 20:44:17 +00:00
Gilles Debunne
fc3e05538f Merge "Text handles do not handle scroll correctly" into ics-mr0 2011-10-28 13:41:01 -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