Robert Greenwalt
348297abc0
Merge "Start using IP tool for advanced routing." into ics-mr0
2011-11-04 15:53:37 -07:00
The Android Automerger
35eee402c7
merge in ics-mr0-release history after reset to ics-mr0
2011-11-04 15:40:13 -07:00
Andreas Huber
6d25e3400c
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
...
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug: 5549263
2011-11-04 15:17:55 -07:00
Mathias Agopian
e65beaabe4
Fix rotation displays frame N-1 briefly while rotating
...
The ScreenShot layer is now created hidden. The screenshot itself
is aquired during the transaction when the layer is made visible.
This guarantees the screenshot and the layer happen atomically
with respect to screen updates.
Bug: 5534521
Change-Id: Ida23e1f13d5716ec83b78a15712e0646d6cf8729
2011-11-04 15:15:32 -07:00
Jamie Gennis
2ab7ec90e4
Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1
2011-11-04 15:10:11 -07:00
Jamie Gennis
0dc908ce71
EGL: Add stubs for EGL_ANDROID_blob_cache
...
This change adds a stub cache implementation that gets passed to the
underlying EGL implementation at initialization time.
Change-Id: I14437c5b6f91b7a34a19bb02ad802e6e54f88d2a
2011-11-04 15:01:51 -07:00
Doug Zongker
e2d58e95a0
close input streams obtained from otacerts zip file
...
Quells a StrictMode warning from OTA verification.
Change-Id: Ie3e4c345551d1925fcc37c3ae9ce5c45713be93a
2011-11-04 14:11:12 -07:00
Dianne Hackborn
960177ae39
am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
...
* commit 'ca25016775391bf71f7503aeb61798df46fa54cf':
DO NOT MERGE. Integrate: Include showmap output in bug report.
2011-11-04 21:01:40 +00:00
Dianne Hackborn
ca25016775
Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
2011-11-04 14:00:21 -07:00
Dave Burke
a3af4c94df
am 3ee47188: Frame rate to 48 fps
...
* commit '3ee471889b09d90affddd00c409a515a64b6861b':
Frame rate to 48 fps
2011-11-04 20:55:30 +00:00
Amith Yamasani
cf72ab4dde
Don't show the submit button when it isn't enabled.
...
There was a particular scenario where it was being shown even if it's disabled.
Bug: 5412759
Change-Id: I34edd385062bed48bccef35e8240932d4cc96fd1
2011-11-04 13:49:28 -07:00
Dianne Hackborn
9b424b4451
DO NOT MERGE. Integrate: Include showmap output in bug report.
...
Change-Id: I51265eb248b7eba360f0758fa9eb8a01821f108a
2011-11-04 13:38:18 -07:00
Dave Burke
3ee471889b
Frame rate to 48 fps
...
Change-Id: I95645b3921db22dfeca97ad2743299ccda5de83b
2011-11-04 13:08:15 -07:00
Daniel Sandler
221733a45a
Offer the user an option to launch Dreams when docked.
...
SystemUI now registers for DESK_DOCK launches, so users with
other dock apps installed can still opt to use those in this
new regime.
(Part of migrating users away from DeskClock as the dock app.)
Bug: 3155234
Change-Id: I0da0f04f8a0a89e7d237c092f16f4f27eb88c92c
2011-11-04 15:15:41 -04:00
Daniel Sandler
69a1da4dde
Teach UiModeMgr about high-end and low-end desk docks.
...
Should fix dock mode on Stingray, since its docks advertise
themselves as EXTRA_DOCK_STATE_LE_DESK and
EXTRA_DOCK_STATE_HE_DESK but not EXTRA_DOCK_STATE_DESK.
Bug: 5569662
Change-Id: I93197665c0df8dea06ca8fadae97ec267c751c85
2011-11-04 15:15:40 -04:00
Mathias Agopian
515c6b44d5
Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1
2011-11-04 12:13:36 -07:00
Irfan Sheriff
45a04db3f9
Merge "Avoid quick shutdown after a driver start" into ics-mr1
2011-11-04 11:47:27 -07:00
Narayan Kamath
eaa17b768f
Merge "Add an API for querying / enabling network TTS support." into ics-mr1
2011-11-04 11:01:57 -07:00
Chet Haase
aa4d2f69bd
Merge "Improve Launcher drag performance." into ics-mr1
2011-11-04 11:01:25 -07:00
Dianne Hackborn
55fe6763d2
Merge "Include showmap output in bug report." into ics-mr1
2011-11-04 10:46:09 -07:00
Amith Yamasani
d69c203cd4
Merge "Close suggestions cursor when SearchView is detached." into ics-mr1
2011-11-04 10:41:10 -07:00
Robert Greenwalt
3b28e9a3da
Start using IP tool for advanced routing.
...
bug:5495862
bug:5396842
Change-Id: I5e31b352b14a4dc746cacce4d61cf8d9ad7382a0
2011-11-04 09:52:04 -07:00
Flavio Lerda
8f7d88cc67
Merge "Add a query parameter to look-up a SIP address." into ics-mr1
2011-11-04 09:48:18 -07:00
Chet Haase
1f4786bbe1
Improve Launcher drag performance.
...
Launcher swiping looks choppy. It's because we deliver the
motion events of the drags asynchronously, and sometimes we
may get an event to redraw before the motion event is posted, so we
end up drawing again without updating to the latest motion
information.
This fix makes input event processing more proactive. Every time
we run ViewRootImpl.performTraversals() (which is what
happens whenever we need to layout, measure, and/or draw), we
first process all pending input events, ensuring that we are
completely up-to-date with posted events prior to drawing, so that the
drawing we do is synchronous with the events we've received.
This eliminates the choppiness and means that we can now get the full
refresh rate on the screen with drag events.
The fix was done for Launcher, but it is pervasive in the system,
so this may fix other laggy drag behavior as well.
Change-Id: I8dbed6acadc2662f317f736e769f536f555701aa
2011-11-04 09:22:58 -07:00
Eric Laurent
914972be65
Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1
2011-11-04 08:29:30 -07:00
Eric Laurent
79178b8b3d
Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1
2011-11-04 08:27:45 -07:00
The Android Open Source Project
7b95eba9f4
am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release
...
* commit '8242cc49a90aa13a4830a735438b6e3cf73ea0f0':
Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
2011-11-04 15:01:30 +00:00
The Android Open Source Project
8242cc49a9
Reconcile with ics-mr0-release ics-factoryrom-2-release
...
Change-Id: I81cf3b3994cb9a1c18fca3ce0049e09402543086
2011-11-04 07:56:43 -07:00
Wink Saville
c430b70b5a
am 9ca0f122: am e4ca9242: Fix the build.
...
* commit '9ca0f1222711b4cce1de56c6623790165870392a':
Fix the build.
2011-11-04 12:04:09 +00:00
Dave Burke
dc858596b2
am 43e72b1f: (-s ours) am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
...
* commit '43e72b1f5692dd9e220158001317c2abc0ecafcf':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
2011-11-04 12:04:08 +00:00
Wink Saville
cc27a93947
am 8b771243: am 3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0
...
* commit '8b77124395713de5e09c9b56fac03c244513dc25':
Separate data stall detection and recovery from net stats.
2011-11-04 12:04:06 +00:00
Wink Saville
9ca0f12227
am e4ca9242: Fix the build.
...
* commit 'e4ca92421cc07c2f7f152b774dd1ac7a8944028b':
Fix the build.
2011-11-04 11:59:29 +00:00
Dave Burke
43e72b1f56
am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
...
* commit '32b5a7eeaf758fad0c24131603cdd54cd2883a58':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
2011-11-04 11:59:27 +00:00
Wink Saville
8b77124395
am 3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0
...
* commit '3d7084519b03da0681da13fb8d7d4a0914d11646':
Separate data stall detection and recovery from net stats.
2011-11-04 11:59:25 +00:00
Katie McCormick
91dcf4e11d
am 6d77ad80: am 6c5951bf: Doc change: Updating device-admin with camera info.
...
* commit '6d77ad80375a82b97aefb7d5ab547a2944135edf':
Doc change: Updating device-admin with camera info.
2011-11-04 11:34:16 +00:00
Katie McCormick
6d77ad8037
am 6c5951bf: Doc change: Updating device-admin with camera info.
...
* commit '6c5951bf9798369d335096f1f73ee1299cf903ff':
Doc change: Updating device-admin with camera info.
2011-11-04 11:28:39 +00:00
Ken Wakasa
988af0861e
am 943f6d0b: Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1
...
* commit '943f6d0b33f599ed00b76c59b4a4b4c41d0e66f2':
Turn off the spell checker when the spell checker is disabled in the settings
2011-11-04 08:05:44 +00:00
Ken Wakasa
943f6d0b33
Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1
2011-11-04 01:02:12 -07:00
Wink Saville
e4ca92421c
Fix the build.
...
Needed to update EventLogTags.logtags
Change-Id: Ie7d13e012c52778892167380f4fd273f67bb7d62
2011-11-03 23:16:55 -07:00
Dave Burke
32b5a7eeaf
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
3d7084519b
Merge "Separate data stall detection and recovery from net stats." into ics-mr0
2011-11-03 21:26:35 -07:00
Mangesh Ghiware
c3a2f323e9
Update fix to restore view and text wrap scales.
...
Fixes bug 5544556: All email content is wrapped prematurely.
Previous change (I5a22dd20) didn't take a few other cases of
mViewScale>0 into account.
Change-Id: I4f9578f3558f026c472492ac07d19004416dc228
2011-11-03 21:12:27 -07:00
Dianne Hackborn
5123468934
Include showmap output in bug report.
...
Change-Id: I02d246defc73ea45c469ab7cb899f45d5663a301
2011-11-03 19:19:28 -07:00
Wink Saville
2861d23d66
Separate data stall detection and recovery from net stats.
...
Also use the AlarmManager instead of messages so the delays
are consistent whether sleeping or not.
Bug: 5534004
Change-Id: I24118b30214dddf8183c1200a89555d6c528e606
2011-11-03 18:52:58 -07:00
Andreas Huber
efa4015ae3
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
...
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug: 5549263
2011-11-03 18:15:43 -07:00
Jeff Brown
67406a46d1
Slight change to the unwinder API.
...
Change-Id: I5424de76a21b74842e004e0281936b3f492d3c7a
2011-11-03 17:30:54 -07:00
Alex Sakhartchouk
fc5e224e8d
Properly passing an unused variable through.
...
Change-Id: Ie49b5855bfca4e202ed41b6167a899832e99d728
2011-11-03 17:28:33 -07:00
Irfan Sheriff
a25b1a272c
am a3d9eba1: Merge "Reset IP failure counter on a success" into ics-mr1
...
* commit 'a3d9eba10461158a52acfc2a0324696b25db761f':
Reset IP failure counter on a success
2011-11-03 23:10:04 +00:00
Katie McCormick
6c5951bf97
Doc change: Updating device-admin with camera info.
...
Change-Id: I5a5bf50b1362346f0a245ee40248a62a3c94a879
2011-11-03 16:07:05 -07:00
Irfan Sheriff
a3d9eba104
Merge "Reset IP failure counter on a success" into ics-mr1
2011-11-03 16:06:07 -07:00