Commit Graph

259 Commits

Author SHA1 Message Date
Steve Block
582deec1f3 Fixes a problem with URL parsing when the host ends with a dot
The WebAddress class provides a lenient parser for URLs. Currently, it
identifies the host portion with the regex [<chars>]+(\.[<chars>]+)* where
<chars> is the set of characters valid for the host name. This pattern excludes
the case where the host ends with a dot, which is valid possibility. As a
result, any trailing dot is pushed into the path component. Since we add a
leading slash to the path if one is missing, the result is a path that begins
with '/.'.

This fix changes the host regex to [<chars>]+[<chars>\.]* which allows trailing
dots and fixes the problem.

Bug: 2337042
Change-Id: I310512531787e0f742988f5d815ad944fd39e059
2010-09-07 13:22:23 +01:00
Wink Saville
30bf654574 Remove unused intent from filter and unused method.
Change-Id: I8c503903fceb508658cce14918f2c77c04289873
2010-09-03 10:28:57 -07:00
Robert Greenwalt
21e7844967 Merge "Remember mobile nets availability" 2010-09-01 16:20:09 -07:00
Robert Greenwalt
cff25ffb0a Remember mobile nets availability
Change-Id: I402ac64bf477b0b600b17f0267c2ff5c19ab9cf3
2010-09-01 14:38:07 -07:00
Robert Greenwalt
f6682b0317 Fix NPE in toString
bug:2965739
Change-Id: Ic3f274cba8ac668d86a8f69f1b2b738d348b3977
2010-09-01 10:09:40 -07:00
Andrew Stadler
ac19f24cc1 Fix crash when proxy exclusion list is null.
Also cleaned up source a little bit and eliminated a warning.

Bug: 2964821
Change-Id: I35825bb345742ea1a1854e8998aa67e353deaa17
2010-08-31 14:28:58 -07:00
Irfan Sheriff
ef6c1431fa Fix reboot loop due to NPE
Bug: 2962059
Change-Id: I73d5fa5ef0f29dc139c843b34f58f189c94dfe4b
2010-08-30 20:40:19 -07:00
Robert Greenwalt
37e65ebb7e Rename NetworkProperties to LinkProperties
Also add copy constructors and use them when giving out data.

Change-Id: Id320eb8fb91d0bd250305ce7bb4f628570215615
2010-08-30 15:54:37 -07:00
Robert Greenwalt
fc40701c8b Merge "resolved conflicts for merge of 4ea54f44 to master" 2010-08-27 17:27:02 -07:00
Wink Saville
db4c91ff7b Merge "Add NetworkProperties to DataConnection." 2010-08-27 11:38:48 -07:00
Wink Saville
1f6408a96c Add NetworkProperties to DataConnection.
Since we have NetworkProperties we can remove the individual accessors
from Phone and its subclasses.

Change-Id: Id9969a880405900a63051b3ae4019d889afb1fe8
2010-08-27 11:15:18 -07:00
Robert Greenwalt
585ac0fc8d resolved conflicts for merge of 4ea54f44 to master
Change-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56
2010-08-27 11:05:11 -07:00
Ben Dodson
58a345936d Added methods for managing uri query parameters
Change-Id: Ic98c1bd159740dd4d895889079f9f2abae4fc2b9
2010-08-26 17:15:01 -07:00
Ben Dodson
4e8620f868 Updated documentation for upcoming fix for @code tags
Change-Id: Id7b163179132b9cf180afecb4e9e10ee39bcd415
2010-08-26 14:02:20 -07:00
Danica Chang
6fdd0c6274 bluetooth tethering
Change-Id: Id6d5fb1922facc7013abc29214d3e1141995b767
2010-08-18 15:07:50 -07:00
Steve Howard
1944cca612 am 0899e8bc: am baf3869b: Merge "Fix up handling of null fields in DownloadManager." into gingerbread
Merge commit '0899e8bc9dc44249d6be016bed71a9ecee56f132'

* commit '0899e8bc9dc44249d6be016bed71a9ecee56f132':
  Fix up handling of null fields in DownloadManager.
2010-08-18 14:21:44 -07:00
Steve Howard
0899e8bc9d am baf3869b: Merge "Fix up handling of null fields in DownloadManager." into gingerbread
Merge commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8' into gingerbread-plus-aosp

* commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8':
  Fix up handling of null fields in DownloadManager.
2010-08-18 13:38:42 -07:00
Steve Howard
8651bd5d18 Fix up handling of null fields in DownloadManager.
Document fields that can have invalid/unknown values, and fix handling
of null local URI.

Change-Id: I7684c151f0a20c91340655246bec2ce0a60328e4
2010-08-17 14:10:25 -07:00
Steve Howard
fe762e9d12 am ab59914d: am b3e957bb: Merge "New download manager error code when we can\'t resume." into gingerbread
Merge commit 'ab59914de7ac714d04a5013c53aa9c7edb5421a2'

* commit 'ab59914de7ac714d04a5013c53aa9c7edb5421a2':
  New download manager error code when we can't resume.
2010-08-17 08:39:18 -07:00
Steve Howard
ab59914de7 am b3e957bb: Merge "New download manager error code when we can\'t resume." into gingerbread
Merge commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28' into gingerbread-plus-aosp

* commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28':
  New download manager error code when we can't resume.
2010-08-17 08:27:17 -07:00
Steve Howard
33bbd12a05 New download manager error code when we can't resume.
Adding DownloadManager.ERROR_CANNOT_RESUME for when we can't resume an
interrupted download (because the server didn't provide an ETag or
doesn't support range requests), as well as the necessary private
status code in Downloads.Impl.

Change-Id: I5a66f1e1964198552ab2216aa6d3cc0db2254e21
2010-08-16 14:28:17 -07:00
Wink Saville
c7a98341b0 Add documentation to NetworkStateTracker and a small change to the API.
Also, removed some unused NetworkStateTracker event codes.

The API change was to add context and target to startMonitor, this makes
it easier to document what the actual interface contract is.

Change-Id: If9b52486c3c281fe4794bc78417c8b03888414b1
2010-08-13 16:11:42 -07:00
Robert Greenwalt
993f85f319 am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into gingerbread
Merge commit 'e300b8c10c306b575bbbec29d5572ba92a97785e' into gingerbread-plus-aosp

* commit 'e300b8c10c306b575bbbec29d5572ba92a97785e':
  DO NOT MERGE Always set/remove default routes.
2010-08-13 16:03:29 -07:00
Robert Greenwalt
b738fb9938 DO NOT MERGE Always set/remove default routes.
Must clean up default route if a default 3g connection is replaced
by a non-default (ie, mms) connection on teh same interface.

Also stop mucking with all connections dns and routes - do it only
for the connection that has changed.

bug:2865974
Change-Id: Ifdf49080fa0413a4d826813706c809975a562dfa
2010-08-13 15:53:13 -07:00
Irfan Sheriff
0d25534fed Split WifiStateMachine from WifiStateTracker
Notifications handled in WifiService. WifiStateTracker tracks
state for connectivity service

Change-Id: Idb0cf494898d28712af0f95f9e60c5417cd4a053
2010-08-10 15:18:25 -07:00
Jeff Hamilton
f0cfe3438a Add a few helpful APIs.
Change-Id: Ie57aa71eb77a1e0fb058f4eb6f40d4144a6dfce7
2010-08-10 10:13:18 -05:00
Steve Howard
bd576042a5 am 974c993f: am 8e15afe7: Make downloads visible by default.
Merge commit '974c993fc3771169efa73e40981d18ac0969fac8'

* commit '974c993fc3771169efa73e40981d18ac0969fac8':
  Make downloads visible by default.
2010-08-06 19:06:31 -07:00
Steve Howard
974c993fc3 am 8e15afe7: Make downloads visible by default.
Merge commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625' into gingerbread-plus-aosp

* commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625':
  Make downloads visible by default.
2010-08-06 18:54:03 -07:00
Steve Howard
8e15afe799 Make downloads visible by default.
Change-Id: I8f8b325658d8afc964bddd3f1c03ed20e6bd10aa
2010-08-06 11:06:49 -07:00
Oscar Montemayor
6f71b42bc4 Fix for bug 2890320 Browser crashes, after adding bookmark.
Simplified locking scheme in Proxy's getProxy(..) method.
Also modified ContentObserver creation to be done from any thread.

Change-Id: I54edb56a86796f08a1310cf1ae1d1f0c42a0cbc8
2010-08-05 14:49:28 -07:00
Brian Carlstrom
1b7e4d5adc am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp

* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:40:45 -07:00
Brian Carlstrom
3c7c351a62 Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b528
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd
git cherry-pick --no-commit 5e8a587d

Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
2010-08-04 23:47:38 -07:00
Oscar Montemayor
2cd1dbe50d Merge "Fix for bug 2890320 Browser crashes, after adding bookmark. Fixed Proxy class locking and dealing with empty exclusion lists." 2010-08-04 17:15:25 -07:00
Oscar Montemayor
b8f66019ad Fix for bug 2890320 Browser crashes, after adding bookmark.
Fixed Proxy class locking and dealing with empty exclusion lists.

Change-Id: I2cfcc099961aa3eec388a7457f40b0b2236f84c8
2010-08-04 16:07:02 -07:00
Irfan Sheriff
1cf56ab9c6 Avoid hostname lookup in NetworkProperties
Bug: 2870816
Change-Id: Iba98d7d25da5068051dba19aa04702cc93b7cc05
2010-08-04 15:15:49 -07:00
Robert Greenwalt
fa64bcfb01 Merge "Don't reset connections switching default->hipri" 2010-08-03 09:52:48 -07:00
Robert Greenwalt
153b4374d0 Don't reset connections switching default->hipri
A usecase is to use hipri to keep alive 3g connections when wifi
is about to be brought up.  They are the same network, so don't
do the reset unless both are down.

This will go away when we get the deferred network downing.

bug:2865630
Change-Id: I07729b7776fe5ea129120c688cf7839a55a7ed95
2010-08-02 18:13:42 -07:00
Oscar Montemayor
16fb7910fd Global Proxy changes to proxy class.
Change-Id: Ib2da33670b1da33c0b35b60f4fcbd0bc084e616a
2010-08-02 16:29:29 -07:00
Brian Carlstrom
5e8a587d49 Tracking merge of dalvik-dev to master
Change-Id: Id4c19401ad0aa238219aaf5d9a20d2889d0a4b18
2010-07-28 23:49:30 -07:00
Steve Howard
82d0249f5b am 55020622: am 7feab347: Merge "Un-@hide new download manager public API." into gingerbread
Merge commit '550206226b59ff116cc677121c82aa61eac966bc'

* commit '550206226b59ff116cc677121c82aa61eac966bc':
  Un-@hide new download manager public API.
2010-07-27 16:59:50 -07:00
Steve Howard
550206226b am 7feab347: Merge "Un-@hide new download manager public API." into gingerbread
Merge commit '7feab3470156c7864fe159115d575c16f0974493' into gingerbread-plus-aosp

* commit '7feab3470156c7864fe159115d575c16f0974493':
  Un-@hide new download manager public API.
2010-07-27 16:37:39 -07:00
Irfan Sheriff
a2a1b911a3 Refactor WifiStateTracker
Implement WifiStateTracker as a HSM.

Change-Id: Ic12fd78f1f183b5c4dea8ad2301002267ceff0cb
2010-07-27 11:59:29 -07:00
Steve Howard
46be2a5bb6 Un-@hide new download manager public API.
Change-Id: Ia8433160ef40e25fb9408f05f97c7bbfa10a807e
2010-07-26 20:44:35 -07:00
Jean-Baptiste Queru
14d9c34ccb am c7ab09ed: Merge "Fix build."
Merge commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b' into gingerbread-plus-aosp

* commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b':
  Fix build.
2010-07-26 10:05:23 -07:00
Steve Howard
a265083890 am 5e43c5a6: am b8e07a51: DL manager support for broadcasts + connectivity control
Merge commit '5e43c5a6e8f94134850c7e3bc4c7f657e1579746'

* commit '5e43c5a6e8f94134850c7e3bc4c7f657e1579746':
  DL manager support for broadcasts + connectivity control
2010-07-21 21:27:02 -07:00
Steve Howard
5e43c5a6e8 am b8e07a51: DL manager support for broadcasts + connectivity control
Merge commit 'b8e07a51c1849d6894c5773a3daacedd01294218' into gingerbread-plus-aosp

* commit 'b8e07a51c1849d6894c5773a3daacedd01294218':
  DL manager support for broadcasts + connectivity control
2010-07-21 21:22:58 -07:00
Steve Howard
b8e07a51c1 DL manager support for broadcasts + connectivity control
* Additions to DownloadManager to support control of broadcast intents, allowed network types, and roaming control.  This includes new constants and added implementation.
* New DB columns to hold connectivity flags and one to indicate whether the download was initiated through the public API; this is used to change behavior related to broadcast intents and connectivity controls.

Change-Id: I2e8e4ce92cde7889a0f24dc43b86c596c73c0eaa
2010-07-21 19:09:35 -07:00
Jean-Baptiste Queru
536ff5a6d7 Fix build.
Switch to using public APIs instead of private ones.

Change-Id: Ia3468d94b3dadeb6a000ce419ee08f7e7ba5dc67
2010-07-16 15:30:40 -07:00
Jean-Baptiste Queru
cc0aad38f0 Fix build.
Switch to using public APIs instead of private ones.

Change-Id: Ia3468d94b3dadeb6a000ce419ee08f7e7ba5dc67
2010-07-16 15:18:56 -07:00
The Android Open Source Project
a508668309 am c9ecd445: merge from open-source master
Merge commit 'c9ecd445b86552265b4adb90e5df2fbe5f71cb8e'

* commit 'c9ecd445b86552265b4adb90e5df2fbe5f71cb8e':
  Added method getPreferredHttpHost
2010-07-16 14:01:43 -07:00