Commit Graph

338 Commits

Author SHA1 Message Date
Bjorn Bringert
eb8be973c7 Make fields in WebAddress private, add getters/setters
Change-Id: Iceaf3d648289344e53c37273f7324a79676fbef7
2010-10-13 16:21:01 +01:00
Brad Fitzpatrick
f21b4cde18 resolved conflicts for merge of b3ffd4ad to master
Change-Id: I80b227b678ef168a45494acf879debed5861de39
2010-10-11 10:46:01 -07:00
Brad Fitzpatrick
b3ffd4adcc am 3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost"
Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp

* commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090':
  Don't perform DNS lookup in android.net.Proxy.isLocalHost
2010-10-10 11:49:43 -07:00
Irfan Sheriff
96ca91761e Use LinkProperties for IP and proxy configuration
Change-Id: I4ae817fb00141e9a742216b7fd02dca1ed228270
2010-10-08 12:41:11 -07:00
Irfan Sheriff
ed5d7d17c9 Add LinkAddress
LinkAddress stores IP address + prefix for a network link

Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
2010-10-06 11:04:05 -07:00
Robert Greenwalt
ba175a5e13 Turn on some debugging info
bug:3060742
Change-Id: I86f4e0b3f678c80e1bee11abd32ab0b9e0563b09
2010-10-05 19:12:26 -07:00
Andreas Sandblad
e6b29898b1 Don't perform DNS lookup in android.net.Proxy.isLocalHost
This fixes degrade introduced by:
Switch to using public APIs instead of private ones.
536ff5a6d7

Change-Id: I63cbea82d85d55d933bcfc9e7a311d1aa2324955
2010-10-04 17:59:05 +02:00
Dianne Hackborn
dc71b9e4d6 resolved conflicts for merge of 6a3eddb4 to master
Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e
2010-09-30 20:34:34 -07:00
Dianne Hackborn
6a3eddb469 am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread
Merge commit '0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp

* commit '0a69f597604254bc37721b135ab612eaacdd0cbd':
  Rub in a little 'ol log-b-gone.
2010-09-30 19:12:11 -07:00
Dianne Hackborn
cef65eeb03 Rub in a little 'ol log-b-gone.
Mmmmmm...  great fresh scent!

Change-Id: I050e70b31b5d4a9c6731f15a4b51a3620a33a78d
2010-09-30 18:27:22 -07:00
Steve Howard
d58429f9ac Manual merge: Move DownloadManager to android.app
Changing package at hackbod's request.

Change-Id: I867017b6a9f4684d30c6c5bd1b07f9cabecddb9f
2010-09-28 17:28:43 -07:00
Steve Howard
9d9719c44a am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread
Merge commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399' into gingerbread-plus-aosp

* commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399':
  Move DownloadManager to android.app (DO NOT MERGE)
2010-09-28 12:41:42 -07:00
Steve Howard
31fd85f39b Move DownloadManager to android.app (DO NOT MERGE)
Changing package at hackbod's request.  I'll merge this manually, as
there's some additional master-only code that will be to be
simultaneously changed.

Change-Id: Ibb629ec1c31807fbee31e0193c6a941d04be0117
2010-09-27 17:12:47 -07:00
Irfan Sheriff
1beeab70a2 Merge "use hostname when address null ProxyProperties parcelling" 2010-09-27 16:24:23 -07:00
Irfan Sheriff
798ffa1237 use hostname when address null ProxyProperties parcelling
In ProxyProperties parcel, use toString so that hostname
is used when address is null

Change-Id: I4813dbdaf3c4a7bb404edf960d0f990c732ec0b8
2010-09-27 12:16:11 -07:00
Steve Howard
e9d51c4e88 am ffe47726: am e78fc18b: Intent action to launch downloads UI.
Merge commit 'ffe477263c503ce75d609d5360cf5e0c72a1363f'

* commit 'ffe477263c503ce75d609d5360cf5e0c72a1363f':
  Intent action to launch downloads UI.
2010-09-24 16:02:45 -07:00
Steve Howard
ffe477263c am e78fc18b: Intent action to launch downloads UI.
Merge commit 'e78fc18b339bfe2915e61aef2013a17f0a9ede33' into gingerbread-plus-aosp

* commit 'e78fc18b339bfe2915e61aef2013a17f0a9ede33':
  Intent action to launch downloads UI.
2010-09-24 15:51:50 -07:00
Steve Howard
e78fc18b33 Intent action to launch downloads UI.
Change-Id: Ifd21b9b916479062d51e60108d16ce3f46b453a5
2010-09-24 15:43:51 -07:00
Robert Greenwalt
f333123d50 resolved conflicts for merge of 2d457a32 to master
Change-Id: I08fc7881010083407a102f471483cd6d5b9774b4
2010-09-24 14:47:06 -07:00
Robert Greenwalt
2d457a32a6 am 8f97fe55: Merge "Move long Connectivity tasks to handler thread." into gingerbread
Merge commit '8f97fe551e7bd95abf395eed303b975eaa8f0158' into gingerbread-plus-aosp

* commit '8f97fe551e7bd95abf395eed303b975eaa8f0158':
  Move long Connectivity tasks to handler thread.
2010-09-24 11:09:29 -07:00
Robert Greenwalt
8f97fe551e Merge "Move long Connectivity tasks to handler thread." into gingerbread 2010-09-24 10:42:46 -07:00
Robert Greenwalt
8dcc28be06 Move long Connectivity tasks to handler thread.
Reduce ANR potential.
bug:2942829

Change-Id: I21610b462d5ab91821015cd16eecd86d2c0580d1
2010-09-23 16:43:21 -07:00
Steve Howard
9c7bec2538 am 1fd11292: am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads
Merge commit '1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3'

* commit '1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3':
  Have DownloadManager pass file URIs for legacy external downloads
2010-09-23 13:11:19 -07:00
Steve Howard
1c134d5559 am 8449490a: am 4f564cde: Tweaks to download manager API based on API review feedback
Merge commit '8449490a94fb5ab02be2a67d4b57c017d8abd75a'

* commit '8449490a94fb5ab02be2a67d4b57c017d8abd75a':
  Tweaks to download manager API based on API review feedback
2010-09-23 13:10:58 -07:00
Steve Howard
1fd1129264 am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads
Merge commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8' into gingerbread-plus-aosp

* commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8':
  Have DownloadManager pass file URIs for legacy external downloads
2010-09-23 13:02:21 -07:00
Steve Howard
8449490a94 am 4f564cde: Tweaks to download manager API based on API review feedback
Merge commit '4f564cdeb8478f1a20263fc036c74cc4a63145c3' into gingerbread-plus-aosp

* commit '4f564cdeb8478f1a20263fc036c74cc4a63145c3':
  Tweaks to download manager API based on API review feedback
2010-09-23 12:50:07 -07:00
Steve Howard
bb0d23b547 Have DownloadManager pass file URIs for legacy external downloads
DownloadManager was set up to return file URIs for public API
downloads to external, but to return content URIs for all others.
This included browser downloads, which are on external but don't go
through the public API.  Since the new downloads UI uses
DownloadManager, it was affected by this change when the user opened a
file from the UI.  Apparently numerous things don't handle content
URIs well, including music preview (clicking on downloaded mp3) and
package installer (clicking on downloaded APK), so this change makes
it generate file URIs for legacy external downloads.

Change-Id: I5c34d8ba188cc8b0d11865262cb451208be78eae
2010-09-23 12:45:28 -07:00
Steve Howard
4f564cdeb8 Tweaks to download manager API based on API review feedback
* improved documentation of the default destination on the download
  cache and the concomitant consequences

* removed NETWORK_WIMAX flag for setting allowed networks

* changed request headers behavior to support multiple instances of
  the same header (as allowed in the HTTP spec), renamed
  setRequestHeader() to addRequestHeader()

* accept user-facing strings as CharSequences instead of Strings

* new convenience methods setDestinationInExternalFilesDir() and
  setDestinationInExternalPublicDir() for setting a destination in
  either shared or app-private external storage directories

* renamed setMediaType() to setMimeType()

Change-Id: I8781e2214d939c340209cab917bbbba264ab919c
2010-09-23 12:42:34 -07:00
Steve Howard
d0f533ec0a am 8bf158f6: am 34a7f080: Merge "Un-@hide ability to download without a running notification." into gingerbread
Merge commit '8bf158f6ba31efd2f262fc3ba6cdd13733c7d99e'

* commit '8bf158f6ba31efd2f262fc3ba6cdd13733c7d99e':
  Un-@hide ability to download without a running notification.
2010-09-21 15:07:15 -07:00
Steve Howard
8bf158f6ba am 34a7f080: Merge "Un-@hide ability to download without a running notification." into gingerbread
Merge commit '34a7f0807ee93eaefe83a9192ebc774fb1560875' into gingerbread-plus-aosp

* commit '34a7f0807ee93eaefe83a9192ebc774fb1560875':
  Un-@hide ability to download without a running notification.
2010-09-21 15:02:53 -07:00
Wink Saville
76a562d45f Merge "Cleanup copyright dates add missing method." 2010-09-21 14:55:16 -07:00
Steve Howard
3104775b53 Un-@hide ability to download without a running notification.
Change-Id: Iaf4d86f05e1f98a894a480d7e2e0ecabb42116c4
2010-09-21 14:18:19 -07:00
Jesse Wilson
0acddc582b am 2121ec9b: am 8217eac0: Merge "Fix double-checked locking bug in LocalSocket." into gingerbread
Merge commit '2121ec9bca3507c7c3df6fb4fb1d553990adc05b'

* commit '2121ec9bca3507c7c3df6fb4fb1d553990adc05b':
  Fix double-checked locking bug in LocalSocket.
2010-09-21 10:49:23 -07:00
Jesse Wilson
2121ec9bca am 8217eac0: Merge "Fix double-checked locking bug in LocalSocket." into gingerbread
Merge commit '8217eac0a0b6d394139eefa85d5f467240427e98' into gingerbread-plus-aosp

* commit '8217eac0a0b6d394139eefa85d5f467240427e98':
  Fix double-checked locking bug in LocalSocket.
2010-09-21 10:33:53 -07:00
Jesse Wilson
8217eac0a0 Merge "Fix double-checked locking bug in LocalSocket." into gingerbread 2010-09-21 10:30:39 -07:00
Jesse Wilson
c59a662382 Fix double-checked locking bug in LocalSocket.
This code uses a try/finally to maintain the old behavior of setting
implCreated even if creation fails.

Change-Id: Ieac05568477db4908cd4087714cf00a9addd1d20
2010-09-21 10:26:57 -07:00
Wink Saville
6e80997a9a Cleanup copyright dates add missing method.
Change-Id: I2d8fe0b705e7c90efabb8b3427a539a4a1056874
2010-09-21 09:16:38 -07:00
Steve Howard
9759df072e am 4735be02: am d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread
Merge commit '4735be0211a996f791accc77aeb399df2258ab4c'

* commit '4735be0211a996f791accc77aeb399df2258ab4c':
  New error status for "destination file already exists".
2010-09-20 19:32:19 -07:00
Steve Howard
4735be0211 am d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread
Merge commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1' into gingerbread-plus-aosp

* commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1':
  New error status for "destination file already exists".
2010-09-20 15:43:43 -07:00
Steve Howard
a9e87c9cc3 New error status for "destination file already exists".
Also changing the behavior of the local URI column slightly to better
match the spec -- it should return the client-provided destination so
that it's valid even if the download failed.

Change-Id: Ibf9c07519e647e677ebac8b334b9f2e930e47033
2010-09-20 13:44:51 -07:00
Robert Greenwalt
d192dad69e Enhance http proxy support
Make it read proxys the correct way from CS so it works for all network types.
Add utility class for apache http client support.

bug:2700664
Change-Id: If81917b19b5f0636247a6519a1ec78bd8dbf3596
2010-09-17 16:14:10 -07:00
Wink Saville
00cfe112b4 Add LinkSocket API
Restructuring ConnectivityService to handle multiple connections.

Change-Id: Ia993fbb120bebb844fd0d603dc76fbc700b31fd1
2010-09-16 21:27:39 -07:00
Wink Saville
f61101f626 Add LinkCapabilities
Change-Id: Ia1599ade936b79f12526252c0a2e6b453abb136e
2010-09-16 21:26:59 -07:00
Steve Howard
0b57650666 am 4cd34abe: am 47874718: Merge "Support new URI structure for download provider." into gingerbread
Merge commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b'

* commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b':
  Support new URI structure for download provider.
2010-09-16 13:56:06 -07:00
Steve Howard
4cd34abe53 am 47874718: Merge "Support new URI structure for download provider." into gingerbread
Merge commit '478747181e0414d703076d4786b201718cd93d5b' into gingerbread-plus-aosp

* commit '478747181e0414d703076d4786b201718cd93d5b':
  Support new URI structure for download provider.
2010-09-16 13:45:51 -07:00
Steve Howard
478747181e Merge "Support new URI structure for download provider." into gingerbread 2010-09-16 13:42:34 -07:00
Robert Greenwalt
5b7c5e0552 am f434dd16: am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread
Merge commit 'f434dd1660f222a1ee85e77c98893b90857805c2'

* commit 'f434dd1660f222a1ee85e77c98893b90857805c2':
  Update Inet Connection Status display
2010-09-15 19:49:53 -07:00
Robert Greenwalt
f434dd1660 am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread
Merge commit '134b28a7f049719cb74fd5baadbbcc5915bc861b' into gingerbread-plus-aosp

* commit '134b28a7f049719cb74fd5baadbbcc5915bc861b':
  Update Inet Connection Status display
2010-09-15 18:02:59 -07:00
Robert Greenwalt
134b28a7f0 Merge "Update Inet Connection Status display" into gingerbread 2010-09-15 17:59:54 -07:00
Robert Greenwalt
1e9aac2bd8 Update Inet Connection Status display
Cellular signal strength should also be green - these assets aren't, but
the art guys are working on that.

Also using a new intent so we don't overload the CONNECTIVITY_ACTION and
confuse the apps.
bug:2994024

Change-Id: I6fe8f65dd6e9869d9724064c4fae45340491a4d8
2010-09-15 17:54:17 -07:00