ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
39,725 Commits 2 Branches 0 Tags 54 MiB
d17aaaee47
Commit Graph

39725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
d17aaaee47 merge in ics-mr0-release history after reset to ics-mr0 2011-11-05 00:33:21 -07:00
Jeff Brown
93ff1f985e Fix a leak in Parcel::writeBlob. 
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in.  It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.

Bug: 5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
 2011-11-04 19:26:03 -07:00
Robert Greenwalt
edc0bf5536 Merge "Start using IP tool for advanced routing." into ics-mr0 2011-11-04 15:53:37 -07:00
The Android Automerger
31f4de3e67 merge in ics-mr0-release history after reset to ics-mr0 2011-11-04 15:40:13 -07:00
Dianne Hackborn
d0af48a2a4 Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0 2011-11-04 14:00:21 -07:00
Dave Burke
e11ccb28d1 Merge "DO NOT MERGE Poll input data with a small timeout and don't consume a full core." into ics-mr0 2011-11-03 21:59:20 -07:00
Wink Saville
de6499254b Merge "Separate data stall detection and recovery from net stats." into ics-mr0 2011-11-03 21:26:35 -07:00
The Android Automerger
fd4f0cdc3a merge in ics-mr0-release history after reset to ics-mr0 2011-11-03 06:33:29 -07:00
Eric Fischer
d6474254b8 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-11-02 16:17:03 -07:00
Katie McCormick
3ad9593529 Merge "Doc change: Update instructions to match ICS UI" into ics-mr0 2011-11-02 15:42:18 -07:00
Irfan Sheriff
712fd592e0 Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 2011-11-02 14:37:19 -07:00
Robert Greenwalt
a90153f696 Merge "Ignore errors when untethering" into ics-mr0 2011-11-02 14:26:45 -07:00
The Android Automerger
f34412f489 merge in ics-mr0-release history after reset to ics-mr0 2011-11-02 06:28:40 -07:00
Irfan Sheriff
cb8740f108 Merge "Specify component name for provisioning" into ics-mr0 2011-11-01 21:15:26 -07:00
Jeff Sharkey
a8f0322f70 Merge "Process AMS events in NetworkPolicy handler." into ics-mr0 2011-11-01 21:14:35 -07:00
Katie McCormick
84b955e66f Merge "Doc Update: Update list of widget classes" into ics-mr0 2011-11-01 17:09:44 -07:00
Dima Zavin
2ea1501028 Merge "BatteryService(jni): properly handle read's return value" into ics-mr0 2011-11-01 15:29:42 -07:00
Robert Greenwalt
8782f962e6 Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0 2011-11-01 13:27:56 -07:00
Fabrice Di Meglio
33ba0be0de Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 2011-11-01 12:41:04 -07:00
The Android Open Source Project
0c60db0bec Reconcile with ics-factoryrom-2-release 
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
 2011-11-01 10:08:15 -07:00
The Android Automerger
859836c47d merge in ics-mr0-release history after reset to ics-mr0 2011-11-01 06:28:37 -07:00
Jim Miller
de783e2fb6 Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 2011-11-01 00:47:44 -07:00
Chih-Chung Chang
a662648d66 Merge "Update camera continuous autofocus javadoc." into ics-mr0 2011-10-31 21:04:01 -07: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
38b089498e Merge "Fix volume indication in vibrate mode." into ics-mr0 2011-10-31 16:21:16 -07:00
Martijn Coenen
e87e3dddf7 Merge "Fix disableForegroundNdefPush crash." into ics-mr0 2011-10-31 15:53:08 -07: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
76c5c69255 Reconcile with ics-factoryrom-2-release 
Change-Id: Ic64060bceb7aef3ab5958a8b404e64526f794662
 2011-10-31 12:43:39 -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
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
Jeff Brown
6d42e13be4 Merge "Improve the slow query instrumentation." into ics-mr0 2011-10-28 18:21:05 -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
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
Gilles Debunne
fc3e05538f Merge "Text handles do not handle scroll correctly" into ics-mr0 2011-10-28 13:41:01 -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
Jeff Brown
a2904e6a57 Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0 2011-10-28 01:18:07 -07:00
Robert Greenwalt
21f0be6b0d Merge "Add SFR DUN configuration." into ics-mr0 2011-10-27 21:04:17 -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