60104 Commits

Author SHA1 Message Date
Dima Zavin
f0ad147fc3 Merge "BatteryService(jni): properly handle read's return value" into ics-mr0 2011-11-01 15:29:42 -07:00
Robert Greenwalt
bd9b152805 Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0 2011-11-01 13:27:56 -07:00
Fabrice Di Meglio
46e327ca32 Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 2011-11-01 12:41:04 -07:00
Robert Greenwalt
57c8ac6e13 Add cdma_rmnet4 to list of monitored interfaces
Lets the data traffic arrows work on LTE device on 1x,
but also lets telephony monitor for hung radios on 1X.

bug:5531630
Change-Id: I9fa25a5223afaa2e37373668c899ac28a95783fa
2011-11-01 11:51:27 -07:00
Fabrice Di Meglio
26e9ee28de Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
- better check of ICU returned values
- default to single run if ICU is returning errors

Change-Id: I836818bda4fc72a27b2201f01023cd23c5d99ecb
2011-11-01 10:49:44 -07:00
The Android Open Source Project
9eb4c891a3 Reconcile with ics-factoryrom-2-release
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
2011-11-01 10:08:15 -07:00
Jim Miller
1dce37bd6b 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
4b6353ea02 Merge "Update camera continuous autofocus javadoc." into ics-mr0 2011-10-31 21:04:01 -07:00
Jim Miller
9fa1ada318 Fix 5497305: Make sure we show SIM unlock when "None" is selected
Previously the code ignored SIM state when lockscreen was set to "None."
It now properly accounts for the SIM state when deciding to show.

Change-Id: I272348c1a21b57ac146910850ea3db3adef0227c
2011-10-31 18:21:49 -07:00
Stephen Hines
af675222f6 Merge "Fix potential segfault in RS watchdog." into ics-mr0 2011-10-31 17:14:58 -07:00
The Android Automerger
3b25c4d845 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
6e91e5b689 Merge "Fix volume indication in vibrate mode." into ics-mr0 2011-10-31 16:21:16 -07:00
Martijn Coenen
1eca250b9d Merge "Fix disableForegroundNdefPush crash." into ics-mr0 2011-10-31 15:53:08 -07:00
Stephen Hines
a049184274 Fix potential segfault in RS watchdog.
BUG=5544671

This initializes the watchdog structure properly. Without this fix, it is
possible to call LOGE with a garbage string value.

Change-Id: Ie05eb65f83eca938f18ac962794407d58c3f277f
2011-10-31 15:42:40 -07:00
Martijn Coenen
deb0f20c3d Fix disableForegroundNdefPush crash.
It crashed due to the fact that we're committing a fragment change
after onSaveInstanceState() is called. Instead, commit without
storing the state - as the NfcFragment is something that needs
to be setup explicitly anyway, it is not something the user
expects to be restored.

Bug: 5540962
Change-Id: I5a8cd0e47306f2bbc14b592a0182083bb79cb21a
2011-10-31 15:42:13 -07:00
Svetoslav Ganov
aeb11b5988 Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 2011-10-31 13:28:57 -07:00
The Android Open Source Project
50d0511ddb Reconcile with ics-factoryrom-2-release
Change-Id: Ic64060bceb7aef3ab5958a8b404e64526f794662
2011-10-31 12:43:39 -07:00
Eric Laurent
8ca9a1cf35 Fix volume indication in vibrate mode.
The latest change in silent/vibrate mode selection via volume keys
was such that ringtone volume was not showing 0 when entering vibrate mode
by continuous press on vol down.

Issue 5530217.

Change-Id: I9ba817648e5dca40e0d19f5f606d7763ae61b1c6
2011-10-31 12:12:37 -07:00
The Android Automerger
22e65e4935 Revert "Improve the slow query instrumentation."
This reverts commit 89101cd9d9b5c1a6ff1ed85eba0613ca4c4802e2.
2011-10-30 13:56:11 -07:00
The Android Automerger
9ec258c86a merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-10-30 12:35:09 -07:00
Dima Zavin
98e044a609 BatteryService(jni): properly handle read's return value
Change-Id: I10f5cf3728424e7f5a0c1b460049102fd00a6246
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-28 23:15:11 -07:00
The Android Automerger
ce8e31ea5a 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
Svetoslav Ganov
a840462feb Folding Accessibility Service sample into ApiDemos.
1. Moving Accerssibility Service sample into ApiDemos since
   we are putting all accessibility samples there.

Change-Id: If2deec7f6ad49b0d50112300eda0f7cb48660450
2011-10-28 19:16:24 -07:00
Amith Yamasani
69e640ee84 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
Amith Yamasani
c696a53d1f Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
In order to completely mute the ringer (no vibrate), introduce an extra
state beyond mute, which mutes the vibrator as well, if it was enabled.

Bug: 5530217

Change-Id: Ib1f299ee6bbca56c1aa7e1100662591362d08307
2011-10-28 18:40:43 -07:00
Jeff Brown
2d280f754e Merge "Improve the slow query instrumentation." into ics-mr0 2011-10-28 18:21:05 -07:00
Eric Fischer
2cc1c5d067 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-28 17:29:12 -07:00
Eric Fischer
9853b74653 Import revised translations. DO NOT MERGE
Change-Id: I1aaff923057636af5f68cc730d889adb201f9fc8
2011-10-28 17:02:44 -07:00
Scott Main
8dbe177c5d Merge "docs: fix spell checker client location" into ics-mr0 2011-10-28 15:57:45 -07:00
Scott Main
2323e9bcdc docs: fix spell checker client location
Change-Id: Ic94eab2720cd96b1130869d2071c635b4acb27f5
2011-10-28 15:55:39 -07:00
Joe Fernandez
09848bc89d Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0 2011-10-28 15:40:11 -07:00
Justin Ho
c1cf3b160b Merge "Vertically center the landscape navigation bar." into ics-mr0 2011-10-28 15:01:19 -07:00
Jeff Brown
89101cd9d9 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
Joe Fernandez
61fd1e8d8c docs: add developer guide cross references, Project ACRE, round 3
Change-Id: I6125315ecdf0f78dd947c514a9944729d723e95d
2011-10-28 14:23:23 -07:00
Daniel Sandler
9929fa3058 Vertically center the landscape navigation bar.
We used the paddingTop parameter in the rot90 layout to
pretend that there was a status bar shifting all the
navigation icons down; by setting this to 0 we now spread
the navigation icons evenly across the entire display.

Bug: 5530481
Bug: 5459659
Change-Id: I7f8663049c597300818549f18d7a419537f44b96
2011-10-28 16:47:09 -04:00
Gilles Debunne
4eec98edee Merge "Text handles do not handle scroll correctly" into ics-mr0 2011-10-28 13:41:01 -07:00
Raphael
fe9a2a5471 Cherry-pick f51125d from master to ics-mr0. do not merge.
AAPT fix printf %zd crash on Windows.

There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.

SDK bugs: 20395, 20986

Change-Id: Ic201faffd871bd4c1b7d173d84b089e09750cd85
2011-10-28 11:31:31 -07:00
Gilles Debunne
93347c24a7 Text handles do not handle scroll correctly
A recent patch taking scroll into account was applied at the wrong
level. isVisible() expects positions that already take scroll into
account. isOffsetVisible() is where the initial bug was.

Cherry pick of 144415 from master.

Change-Id: I06ceebfb3d7b24aa4adba886c24fcf9d8dd39d2e
2011-10-28 11:08:56 -07:00
Scott Main
b44038fd29 docs: platform note typo
Change-Id: I257427257573a881acdf7e55804ed5481142ce01
2011-10-28 09:37:19 -07:00
Jeff Brown
84bee4f874 Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0 2011-10-28 01:18:07 -07:00
Robert Greenwalt
c43b9b6d97 Merge "Add SFR DUN configuration." into ics-mr0 2011-10-27 21:04:17 -07:00
Jeff Brown
0772007b61 Fix copyStringToBuffer row index calculation.
Bug: 5515552

Change-Id: I60aa25d2becd3195d6997d23ef5654a31e93bf71
2011-10-27 19:27:11 -07:00
Jake Hamby
31d157bad2 Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0 2011-10-27 17:46:32 -07:00
Jake Hamby
f044a370d4 Fix bug in enabling/disabling SMS cell broadcast activation.
When enabling/disabling SMS cell broadcast channels, we were not calling
setGsmBroadcastActivation() with the correct value after updating the
message IDs. It should be called with true if any message IDs are enabled,
or false if the list is empty.

Added an isEmpty() method to IntRangeManager, and moved the call to
setGsmBroadcastActivation() in SimSmsInterfaceManager to the end of the
enableCellBroadcastRange() and disableCellBroadcastRange() methods,
where it sets the correct value using the new isEmpty() method to test
if there are any message IDs enabled after updating the range list.

Bug: 5525441
Change-Id: I7d1ebd54dacf1de20910947efbf5e87e1957fd1a
2011-10-27 17:23:09 -07:00
Robert Greenwalt
cd04e9de4c Add SFR DUN configuration.
Note that this will currently get rid of the Tethering option as
DUN tethering is broken, but that should get fixed shortly.

bug:5495862
Change-Id: I3a45529649bf05e1e6631069fc830b4051da4fd3
2011-10-27 17:06:13 -07:00
Justin Ho
9e7407ed2b Merge "Increase navigation icon brightness by 10%" into ics-mr0 2011-10-27 16:37:02 -07:00
Justin Ho
e7ff39066c Merge "Increase notification icon brightness" into ics-mr0 2011-10-27 16:36:52 -07:00
Justin Ho
456bb48218 Increase notification icon brightness
Bug: 5526912
Change-Id: Ieca2160bc3ecfc11dc2196491a74956d7554eaa5
2011-10-27 16:29:42 -07:00
Justin Ho
bceff71b92 Increase navigation icon brightness by 10%
Still increase to 1.0 when pressed

Bug: 5509557
Change-Id: I21e5430241f47f3ac8cec2b1f67973c42d23c207
2011-10-27 16:27:54 -07:00
Jamie Gennis
08479ceeba Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0 2011-10-27 16:04:45 -07:00