50209 Commits

Author SHA1 Message Date
Christopher Tate
dc92c82b41 Full backup tweaks
* provide placeholder UI showing backup/restore start/stop/timeout
* don't kill the progress UI in mid stream
* tidy up the pax extended header data writing a little

Change-Id: Ife0cb78e3facb541d8327f1d5ca5fe77faa6cbca
2011-05-13 15:38:02 -07:00
Christopher Tate
83a7cdc565 Use pax extended tar format to support long filenames etc.
'tar' supports only 100-character paths; 'ustar' supports only
155+100 character prefix + paths; neither supports files larger
than about 8 gigabytes.  We now use the POSIX.1-2001 'pax'
extended tar format for those files in the backup stream that
are too large or have too-long paths for the 'ustar' format.

Change-Id: I2f256823091deaec9b1ccea685d2344753c6cb67
2011-05-12 18:07:57 -07:00
Dianne Hackborn
c6c8ada163 am dda64e9a: am 51454295: am df9799f0: Fix build.
* commit 'dda64e9a4af2e7dbc75a3b2fc7c41b9d63848a59':
  Fix build.
2011-05-12 17:42:14 -07:00
Dianne Hackborn
dda64e9a4a am 51454295: am df9799f0: Fix build.
* commit '51454295a5813627a91dd5cf6b486a70a0b389cb':
  Fix build.
2011-05-12 17:39:22 -07:00
Irfan Sheriff
7ac45e0fa6 am 91a46046: (-s ours) am 2cd423a0: Merge commit \'01ea7f01\' into manualmerge1
* commit '91a460469a20529938e0f740ce24e0fdaddb7fa6':
  DO NOT MERGE Add DhcpStateMachine
2011-05-12 17:39:07 -07:00
Irfan Sheriff
91a460469a am 2cd423a0: Merge commit \'01ea7f01\' into manualmerge1
* commit '2cd423a049aeeb0c07f7a556f3a6f701b504606f':
  DO NOT MERGE Add DhcpStateMachine
2011-05-12 17:37:06 -07:00
Dianne Hackborn
51454295a5 am df9799f0: Fix build.
* commit 'df9799f0fc3ef04d9b004ebbda44883f85321b24':
  Fix build.
2011-05-12 17:35:20 -07:00
Irfan Sheriff
7d8b99e22d am 55fa681a: (-s ours) am bb09485b: Merge commit \'09564fbb\' into manualmerge
* commit '55fa681ac774240509def9d75ad7e16ea5515dd1':
  DO NOT MERGE Define Protocol class
2011-05-12 17:31:25 -07:00
Jean-Baptiste Queru
58aa4fc5c9 Merge from honeycomb-plus-aosp
Change-Id: I3a3e2adce3114fb86c8fc4d2af48f1daa7340f6b
2011-05-12 17:25:33 -07:00
Jean-Baptiste Queru
ce0ce2dde2 Merge from honeycomb-plus-aosp
Change-Id: I66f5d4f8b703789a02f7e137235e9321fc413f5d
2011-05-12 17:23:41 -07:00
Irfan Sheriff
2cd423a049 Merge commit '01ea7f01' into manualmerge1 2011-05-12 17:19:56 -07:00
Dianne Hackborn
88bf0e5ae7 Merge "resolved conflicts for merge of 0e59729b to master" 2011-05-12 17:15:22 -07:00
John Reck
c51ab9b93d Merge "Adding functions to query the state of a WebElement." 2011-05-12 17:00:38 -07:00
Chia-chi Yeh
a210ae5cef Merge "Add a method to create ParcelFileDescriptors from DatagramSockets." 2011-05-12 16:55:58 -07:00
Chia-chi Yeh
47f8f0fa70 Add a method to create ParcelFileDescriptors from DatagramSockets.
Change-Id: I16dddb2395628657b140b53a1b2fee5f311b049a
2011-05-12 16:25:27 -07:00
Dima Zavin
f76dd3abbe Merge "update for new audio.h header location" 2011-05-12 16:06:20 -07:00
Irfan Sheriff
55fa681ac7 am bb09485b: Merge commit \'09564fbb\' into manualmerge
* commit 'bb09485bcb36a2d5cf4d7760bfd89807bb3be573':
  DO NOT MERGE Define Protocol class
2011-05-12 16:02:43 -07:00
Jean-Baptiste Queru
e03efcb05f am 2d7d3f78: (-s ours) am f247e545: Merge "Adapt to latest skia"
* commit '2d7d3f78c90734c8067ab76b8f5daca84a311c92':
  Adapt to latest skia
2011-05-12 15:54:13 -07:00
Jean-Baptiste Queru
b0ca8b9dfd am a84d29cb: am 6714e677: Merge "Ninepatch tweaks for better interop"
* commit 'a84d29cb0494310e9472884c7a459603eb305e38':
  Ninepatch tweaks for better interop
2011-05-12 15:52:16 -07:00
Jean-Baptiste Queru
fb401ca777 am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
* commit '20fd3f0d83d4665a6ac33a10f4a48a0f6f159068':
  Tweak audio APIs for better forward/backward/sideways compatibility.
2011-05-12 15:52:12 -07:00
Jean-Baptiste Queru
11ace0015b am e8b669cb: (-s ours) am 71d25778: Merge "Switch to SkSafeUnref for better portability"
* commit 'e8b669cbd7b690349c908ce6c9ce3b342139de04':
  Switch to SkSafeUnref for better portability
2011-05-12 15:52:03 -07:00
Irfan Sheriff
bb09485bcb Merge commit '09564fbb' into manualmerge 2011-05-12 15:47:28 -07:00
Dianne Hackborn
3d0724dc22 resolved conflicts for merge of 0e59729b to master
Change-Id: I2d3a6bddf66b1df0c101c45ea2fec1cf65caf01b
2011-05-12 15:39:41 -07:00
Jean-Baptiste Queru
2d7d3f78c9 am f247e545: Merge "Adapt to latest skia"
* commit 'f247e545b521584bb778e79710c1e60ab814839e':
  Adapt to latest skia
2011-05-12 15:38:18 -07:00
Jean-Baptiste Queru
a84d29cb04 am 6714e677: Merge "Ninepatch tweaks for better interop"
* commit '6714e6774063aae7a8a7a80c36c89ec60170cb27':
  Ninepatch tweaks for better interop
2011-05-12 15:38:15 -07:00
Jean-Baptiste Queru
20fd3f0d83 am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
* commit '4770c79c340c2fb5b6b58c0a1ccf8aac96138ef6':
  Tweak audio APIs for better forward/backward/sideways compatibility.
2011-05-12 15:38:11 -07:00
Jean-Baptiste Queru
e8b669cbd7 am 71d25778: Merge "Switch to SkSafeUnref for better portability"
* commit '71d25778c61327bf82d0e81cd78175a9ee74420a':
  Switch to SkSafeUnref for better portability
2011-05-12 15:38:07 -07:00
Dianne Hackborn
df9799f0fc Fix build.
Change-Id: I97e357aa20c9ba91f20f77d53fc4dca1fd3aa598
2011-05-12 15:16:33 -07:00
Jean-Baptiste Queru
f247e545b5 Merge "Adapt to latest skia" 2011-05-12 15:09:51 -07:00
Derek Sollenberger
0ceb9501b2 Adapt to latest skia
Change-Id: I39247db04ca8b7993b0f5a16fb0324828d04cc3a
2011-05-12 15:05:44 -07:00
Teng-Hui Zhu
858daa1fbb am a0e661b4: am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
* commit 'a0e661b4e4f489fa7c5c2ebadcffc8e6f71132eb':
  Fix the Uri parsing issue
2011-05-12 15:05:29 -07:00
Dianne Hackborn
0e59729b10 am 97280816: am 0f1de9ad: New compat mode front end: UI and persistence.
* commit '972808164adde6c0784e9c836d06219a9cf7eb7f':
  New compat mode front end: UI and persistence.
2011-05-12 15:05:19 -07:00
Teng-Hui Zhu
a0e661b4e4 am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
* commit 'c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
  Fix the Uri parsing issue
2011-05-12 15:01:56 -07:00
Dianne Hackborn
972808164a am 0f1de9ad: New compat mode front end: UI and persistence.
* commit '0f1de9adde0b52d2a385a76232bd7ac30c3eeea2':
  New compat mode front end: UI and persistence.
2011-05-12 15:01:53 -07:00
Chet Haase
674b595fa5 Merge "Antialiasing for rectangles" 2011-05-12 14:57:51 -07:00
Chet Haase
858aa93ddb Antialiasing for rectangles
Change-Id: I7ca6931606541ddd504bd5db7f8dc04b9cde8cd9
2011-05-12 14:55:29 -07:00
Jean-Baptiste Queru
6714e67740 Merge "Ninepatch tweaks for better interop" 2011-05-12 14:24:09 -07:00
Jean-Baptiste Queru
9faa34e603 Ninepatch tweaks for better interop
Change-Id: I96781e2b27fcd6dd05d9726829e8e79ff365cbdc
2011-05-12 14:22:43 -07:00
Jean-Baptiste Queru
4770c79c34 Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 2011-05-12 14:19:41 -07:00
Jean-Baptiste Queru
71d25778c6 Merge "Switch to SkSafeUnref for better portability" 2011-05-12 14:19:26 -07:00
Irfan Sheriff
01ea7f01ec Merge "DO NOT MERGE Add DhcpStateMachine" into honeycomb-mr2 2011-05-12 14:18:03 -07:00
Irfan Sheriff
09564fbb9f Merge "DO NOT MERGE Define Protocol class" into honeycomb-mr2 2011-05-12 14:17:51 -07:00
Teng-Hui Zhu
c1a005c356 Merge "Fix the Uri parsing issue" into honeycomb-mr2 2011-05-12 14:11:25 -07:00
Irfan Sheriff
fe3b33d4ea DO NOT MERGE Add DhcpStateMachine
Add DhcpStateMachine for interation with dhcpcd

- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
  simultaneously
- Optionally, a controller can request a notification prior
    to DHCP request/renewal being sent

Change-Id: I5324814b19ff19863aa6fa89f1e3f0a202930c98
2011-05-12 14:10:11 -07:00
Dima Zavin
34bb419e59 update for new audio.h header location
Change-Id: Ic4c62c4037800802427eb7d3c7f5eb8b25d18876
Signed-off-by: Dima Zavin <dima@android.com>
2011-05-12 14:09:57 -07:00
Wink Saville
1f5e3a1af3 am 9c7c8794: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
* commit '9c7c87941446cdd1263a87a8c4cc5672082c7e12':
  Fix initialization of RouteInfo
2011-05-12 14:08:05 -07:00
Wink Saville
9c7c879414 am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
* commit '76a118dd9e1bc8be33e1e22b7264b7f918f6f050':
  Fix initialization of RouteInfo
2011-05-12 14:03:31 -07:00
Teng-Hui Zhu
64855da755 Fix the Uri parsing issue
Switching back to use the setDataSource with Uri, which can handle both the
file and http path correctly.

Change-Id: I5bfc1d01a8de0a4f8640ffceafbc17984833097a
2011-05-12 13:53:48 -07:00
Svetoslav Ganov
b856f43ea7 Merge "Propagating hover events to JavaScript in WebView" 2011-05-12 13:43:35 -07:00
Andreas Huber
dbbb28d719 Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes." 2011-05-12 13:40:37 -07:00