17656 Commits

Author SHA1 Message Date
Christopher Tate
44a2790374 Make backup/restore asynchronous and enforce timeouts
Callouts to app backup agents are now asynchronous, and timeouts are applied if
they take too long, hang, etc.  The initial timeouts are set to 15 seconds on
backup, 60 seconds on restore.  These operations typically run at background
priority, so it's necessary to give them ample time to run.

As part of setting up this asynchronicity, the Backup Manager's internal thread
management has been overhauled.  It now spins off a single HandlerThread at
startup, and runs backup/restore/etc operations *synchronously* in that thread,
applying timeouts as appropriate.  This means we're no longer spinning up new
threads all the time, and furthermore it ensures that we can never have more
than one operation in flight at once.  Later CLs will remove the now-redundant
logic that previously ensured that operations didn't stomp on each other.

Bug: 2053560
Change-Id: Ie4315c219c7ff6dd8f51f2ad6c0872595b18cff1
2010-01-29 14:07:52 -08:00
Adam Powell
4d3cef348b Merge "ScrollView and HorizontalScrollView now will spring back if smoothScrollBy scrolls out of bounds. Tweaked bounce physics for OverScroller." 2010-01-28 14:03:15 -08:00
Jesse Wilson
1aa444b81f Merge "Fix the broken compile of a currently-not-being-compiled AWT class." 2010-01-28 14:00:48 -08:00
Adam Powell
3fc3737ceb ScrollView and HorizontalScrollView now will spring back if smoothScrollBy scrolls out of bounds. Tweaked bounce physics for OverScroller. 2010-01-28 13:52:24 -08:00
Robert Greenwalt
64fe5646c5 am 6d626d41: am 5381e4ef: Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair
Merge commit '6d626d41e9db62a0eadb61ccb2aa4081a8b9f6d0'

* commit '6d626d41e9db62a0eadb61ccb2aa4081a8b9f6d0':
  Refine fix I53e91db7 to apply only to wifi network
2010-01-28 13:44:45 -08:00
Scott Main
e7d9ba249a am 9985feca: am d243bc71: Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair
Merge commit '9985fecaa0bf32e94695f49bb495c9d0cd41e174'

* commit '9985fecaa0bf32e94695f49bb495c9d0cd41e174':
  docs: reference the history JS file with docRoot in order to
2010-01-28 13:44:35 -08:00
Mike Reed
6e59483f18 am b2244690: (-s ours) am f904be16: Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair
Merge commit 'b22446901c477f40863132a9617368852d358f64'

* commit 'b22446901c477f40863132a9617368852d358f64':
  disable high-quality filtering during scrolling, until I can cached the scaled images.
2010-01-28 13:42:31 -08:00
Jean-Baptiste Queru
1ad05dcbf5 Merge "resolved conflicts for merge of 33ca1f32 to master" 2010-01-28 13:19:56 -08:00
Kenny Root
e096ddee54 resolved conflicts for merge of 33ca1f32 to master
Change-Id: If5344c23c4fd727c0ad684859126337de6ca1d9f
2010-01-28 13:16:19 -08:00
Dianne Hackborn
254cb446fa More device admin.
- Clean up device policy manager APIs.
- Implement lockNow().  For now this just turns the screen off to lock the device.
2010-01-28 13:15:57 -08:00
Andreas Huber
2fd75f3515 Merge "API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played." 2010-01-28 12:56:17 -08:00
Dirk Dougherty
57853a8aec am 99988b6e: am 84207956: Merge "SDK doc change: Misc small fixes." into eclair
Merge commit '99988b6ee6c18b3e12f73635467e1fb4ee9aa43a'

* commit '99988b6ee6c18b3e12f73635467e1fb4ee9aa43a':
  SDK doc change: Misc small fixes.
2010-01-28 12:37:21 -08:00
Dirk Dougherty
cf5769877b am 43d5a09f: am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair
Merge commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8'

* commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8':
  SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
2010-01-28 12:37:10 -08:00
Brian Carlstrom
2c36081131 Merge "Issue 1597: browser crash possibly related to invalid SSL certificate" 2010-01-28 12:33:27 -08:00
Jesse Wilson
a89815e6a5 Fix the broken compile of a currently-not-being-compiled AWT class.
I intend to remove AWT entirely, but doing so is a large project and
this stopgap will remove several errors from Eclipse projects.
2010-01-28 12:31:01 -08:00
Kenny Root
bdbc925a27 resolved conflicts for merge of b0903104 to master
Change-Id: Iff20980c44d42b41ae411c4201e0927cee19d415
2010-01-28 12:03:49 -08:00
Andreas Huber
2564300936 API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played.
related-to-bug: 2393577

Original change by Andrei Popescu <andreip@google.com>
2010-01-28 11:52:43 -08:00
Brian Carlstrom
6505122dfe Issue 1597: browser crash possibly related to invalid SSL certificate 2010-01-28 11:17:43 -08:00
Dirk Dougherty
5f551ef6a8 am 97ca28cd: am 5d14cb34: Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair
Merge commit '97ca28cdd9b12e1c9e9ae57967010b60e61d6bf9'

* commit '97ca28cdd9b12e1c9e9ae57967010b60e61d6bf9':
  doc change: add announce for developer lab at mwc. move adc to carousel.
2010-01-28 10:48:15 -08:00
John Wang
5bb3371823 am 89fec7b1: am 098295a5: Merge "Updated emergency string when locale changes." into eclair
Merge commit '89fec7b155981d6e99eb1e05793f343a5d04aa59'

* commit '89fec7b155981d6e99eb1e05793f343a5d04aa59':
  Updated emergency string when locale changes.
2010-01-28 10:47:27 -08:00
Grace Kloba
f95a61746e am 4f01c927: (-s ours) am 5ff24d5d: DO NOT MERGE
Merge commit '4f01c927503401d560cb4f209b7d9a723c32e8cb'

* commit '4f01c927503401d560cb4f209b7d9a723c32e8cb':
  DO NOT MERGE
2010-01-28 10:47:15 -08:00
Eric Laurent
f1a0f55f71 am 131c5e08: am a59551ba: Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair
Merge commit '131c5e0867d542788cf2dab23b17f2f8cc3d0391'

* commit '131c5e0867d542788cf2dab23b17f2f8cc3d0391':
  Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.
2010-01-28 10:09:09 -08:00
John Wang
70aaacac82 am 64c92f75: am 08cb0024: Handle emergency calls only status in ServiceStateTracker.
Merge commit '64c92f75df7415084aa9f0b304f2a99089b6be9f'

* commit '64c92f75df7415084aa9f0b304f2a99089b6be9f':
  Handle emergency calls only status in ServiceStateTracker.
2010-01-28 10:08:55 -08:00
Grace Kloba
6790918497 Use a single EXTRA_HEADERS intent. 2010-01-28 09:19:10 -08:00
Grace Kloba
0561f1175d Merge "Need to check parent for performLongClick() as it is the result of a delayed message." 2010-01-28 09:14:52 -08:00
Patrick Scott
75d76bcf52 Merge "First pass at the url rendering service." 2010-01-28 08:32:43 -08:00
Andy McFadden
1812a4bfda Merge "Add streaming method profiling support." 2010-01-28 07:27:32 -08:00
San Mehat
51e93db940 Merge "Remove destroy asec command when mounting secure container" 2010-01-28 06:50:18 -08:00
Patrick Scott
9d0f609251 There is no ../com directory and the build (find) agrees. 2010-01-28 09:03:14 -05:00
Patrick Scott
45948fd407 First pass at the url rendering service.
The service renders a list of urls at the given dimension and invokes the
callback interface for each result. A ParcelFileDescriptor is used to transfer
the large image data to the client. The client must close the file descriptor
is order free the underlying resources.

A more robust api will use UrlRendererRequest and UrlRendererResponse objects
to transfer data.
2010-01-28 08:27:42 -05:00
Jacek Surazski
8ea25cc1a1 Merge "timestamp field in ApplicationErrorReport was not getting intitialized on ANRs" 2010-01-28 00:09:56 -08:00
Wei-Ta Chen
c58ffe8253 Unhide YuvImage, which supports compressing a YUV rectangle region to JPEG.
Bug: 2285598
2010-01-28 15:48:54 +08:00
Suchi Amalapurapu
40b5110e74 Remove destroy asec command when mounting secure container 2010-01-27 23:46:13 -08:00
Jesse Wilson
f9e573ec33 Updating Android's API XML files to reflect our new XML APIs!
The effective change is here: https://android-git.corp.google.com/g/38533
It updates DOM to v3 and adds several javax.xml packages to be compatible
with Java 5.
2010-01-27 22:30:38 -08:00
Romain Guy
7543f9e293 Merge "Added OverScroller and overscroll effects for ScrollView and HorizontalScrollView." 2010-01-27 22:00:44 -08:00
Adam Powell
17dfce15d5 Added OverScroller and overscroll effects for ScrollView and HorizontalScrollView. 2010-01-27 21:15:58 -08:00
Fred Quintana
a322dfa47e am 6f3e1e27: am 9a400fa4: Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair
Merge commit '6f3e1e27a697d3e64bf73792c1007135319ff0d5'

* commit '6f3e1e27a697d3e64bf73792c1007135319ff0d5':
  initialize sync adapters that get installed while the system is running
2010-01-27 18:40:11 -08:00
jsh
ec22b4c468 am 3c2d3667: am 036e2108: Fix NPE when importing from USIM.
Merge commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d'

* commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d':
  Fix NPE when importing from USIM.
2010-01-27 18:39:58 -08:00
Dianne Hackborn
d47c6ed4a9 Bite the bullet and add support for multiple device admins. 2010-01-27 17:31:56 -08:00
Yu Shan Emily Lau
9cf5b455d9 am 47f1d4d5: am b1780474: Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair
Merge commit '47f1d4d509b271ddb2f158c761e572413f39f1a8'

* commit '47f1d4d509b271ddb2f158c761e572413f39f1a8':
  Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
2010-01-27 17:27:41 -08:00
Eric Fischer
93a81378d8 am ad0e5363: am 50adb167: Pull in "emergency calls only" translations.
Merge commit 'ad0e53635571066e7928e30a4a669067fff6a382'

* commit 'ad0e53635571066e7928e30a4a669067fff6a382':
  Pull in "emergency calls only" translations.
2010-01-27 17:27:23 -08:00
John Wang
a338136499 am 97fdd0ab: am 7f70998d: Merge "Add Emergency Calls Only String." into eclair
Merge commit '97fdd0aba93f7c609c1194edf636805ff70e4918'

* commit '97fdd0aba93f7c609c1194edf636805ff70e4918':
  Add Emergency Calls Only String.
2010-01-27 17:26:40 -08:00
Chih-Chung Chang
e7bd22a9d9 Unhide camera api for set display orientation. 2010-01-27 17:05:21 -08:00
Jacek Surazski
41a9fd55ac timestamp field in ApplicationErrorReport was not getting intitialized on ANRs 2010-01-27 16:37:21 -08:00
Wei Huang
83e5ff09d5 am 29bc7270: am 495bae67: Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair
Merge commit '29bc7270ec2fd54707326eeee556be2fd4d86ca3'

* commit '29bc7270ec2fd54707326eeee556be2fd4d86ca3':
  fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
2010-01-27 16:29:10 -08:00
Andreas Huber
80828144df Merge "Fix http streaming for shoutcast servers that do not support http ranges." 2010-01-27 16:25:05 -08:00
Andreas Huber
46ce847a62 Fix http streaming for shoutcast servers that do not support http ranges.
related-to-bug: 2295438
2010-01-27 16:21:41 -08:00
Romain Guy
87ef4252ec resolved conflicts for merge of 176a88ff to master 2010-01-27 16:20:49 -08:00
Romain Guy
f929bbd16d Merge "New View.dispatchDisplayHint() API. Bug #2399147" 2010-01-27 15:54:06 -08:00
Romain Guy
43c9cdffb6 New View.dispatchDisplayHint() API.
Bug #2399147

This new API will be used by scrollable containers to tell children that they
are/are not displayed. This will allow lists to hide their filter popup window
for instance.
2010-01-27 15:53:40 -08:00