Commit Graph

1270 Commits

Author SHA1 Message Date
Sreeram Ramachandran
9ccfb02776 Fix build.
Change-Id: I5dab09d2d8a9cff56fa17bb4e8c14b365449399b
2014-05-14 03:56:33 -07:00
Sreeram Ramachandran
a5b0928e5a Specify netId when adding/removing routes.
Change-Id: I07fd950aee726e9721153f75c3e4c10d8e19d8e9
2014-05-14 03:56:33 -07:00
Sreeram Ramachandran
a5c33ff4f2 Set and clear the default network.
Change-Id: I305951e0c4735d708804baa597cc2d9b10f501c0
2014-05-14 03:56:33 -07:00
Paul Jensen
e54dc09048 Get ConnectivityServiceTest building again after 307dd58.
Change-Id: I4520011ba2076d8fac1ca234cb9a79c774992671
2014-05-14 03:56:33 -07:00
Paul Jensen
5996033e08 Use NetId instead of interface name when communicating DNS changes to netd.
Change-Id: Ic82b73de6f50d39d56c5e1a32f5b1f3ebb80bb7d
2014-05-14 03:56:33 -07:00
Robert Greenwalt
f80067d790 Stop adding host routes for dns
bug:13550136
Change-Id: I748e13b96dab111f8f6a4b11d9beaf2a72d0742b
2014-05-14 03:56:32 -07:00
Robert Greenwalt
a4e602ed6a Merge "Add Network-specific host name resolution API." 2014-05-14 05:39:10 +00:00
Robert Greenwalt
948aea53b0 Add NetworkFactory support.
This is a protocol allowing transports to dynamically register with CS for
Handler to Handler communications.

bug:13885501
Change-Id: Ic7275e3724a15efc7e5f80981560c4cb3106007b
2014-05-13 21:21:49 -07:00
Paul Jensen
d4d7a2e361 Add Network-specific host name resolution API.
Change-Id: I932f73158a8f6e3ccc36c319d138180dff2aa070
2014-05-13 19:05:13 -04:00
Jason Monk
d60aeb7dea Merge "Switch PacUrl storage from String to Uri" 2014-05-13 15:14:50 +00:00
Robert Greenwalt
af0903c92d Comment out some new netd calls to fix networking.
bug:14869053
Change-Id: Ifc44f3cbadd0402c7b06e01962695e6b65dc48b3
2014-05-13 06:34:23 -07:00
Robert Greenwalt
2d3cabca36 Merge "Add has* utility functions to NetworkCapabilities" 2014-05-13 01:35:02 +00:00
Robert Greenwalt
e645d4a8f8 Add has* utility functions to NetworkCapabilities
Change-Id: Icf735b778a3956812be522db39c29cf54c757a25
2014-05-12 18:32:22 -07:00
Lorenzo Colitti
356463ad36 Fix reboot loop.
The multinetwork branch is rebooting on startup with:

E/AndroidRuntime( 1024): *** FATAL EXCEPTION IN SYSTEM PROCESS: NetworkStats
[...]
E/AndroidRuntime( 1024): Caused by: java.lang.NullPointerException: Attempt to read from field 'long android.net.NetworkCapabilities.mNetworkCapabilities' on a null object reference
E/AndroidRuntime( 1024): 	at android.net.NetworkCapabilities.<init>(NetworkCapabilities.java:235)
E/AndroidRuntime( 1024): 	at android.net.BaseNetworkStateTracker.getNetworkCapabilities(BaseNetworkStateTracker.java:103)
E/AndroidRuntime( 1024): 	at com.android.server.ConnectivityService.getAllNetworkState(ConnectivityService.java:1134)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService.updateIfacesLocked(NetworkStatsService.java:877)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService.updateIfaces(NetworkStatsService.java:849)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService.access$600(NetworkStatsService.java:139)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService$2.onReceive(NetworkStatsService.java:717)
E/AndroidRuntime( 1024): 	at android.app.LoadedApk$ReceiverDispatcher$Args.run(LoadedApk.java:766)
E/AndroidRuntime( 1024): 	... 4 more

This seems to be due to NetworkCapabilities' copy constructor
not null-checking its argument.  Unbreak things by ignoring null.

Change-Id: Iff3c38e6d72390fa86e51bfce534ebd42a262e19
2014-05-12 18:06:47 -07:00
Robert Greenwalt
a4e1c494f8 Add NetworkRequest to the multinetwork API
bug:13885501
Change-Id: I7b9a01aadf26b6ff104d088b6e283c838ec4dfac
2014-05-12 17:52:48 -07:00
Robert Greenwalt
4d97cb04ba Replace LinkCapabilities with NetworkCapabilities
Also remove unused LinkSocket and LinkSocketNotifier.
bug:13885501

Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3
2014-05-12 16:52:56 -07:00
Jason Monk
60a0e16e09 Switch PacUrl storage from String to Uri
Since the interface for creating/accessing PAC URLs through a
ProxyInfo is Uri based, so should the internal storage and
references.

Change-Id: Ibf15c350f4cc526f81aba3ec463070f26af8f535
2014-05-12 15:44:32 -04:00
Robert Greenwalt
6b0e2a98e4 Add NetworkCapabilities part of API.
Merging to master, adding @hide until we're ready to reveal the API change.

bug:13885501
Change-Id: Ib40e28092e092630bfec557bde77f58eec8ae1c8
2014-05-12 12:12:57 -07:00
Robert Greenwalt
a1402dfa04 First pass on multinetwork framework
Starting to switch netd to use NetId.
Adding the Network identifying class

bug:13550136
Change-Id: Ie0db4fb17c9300bfafb63329adfa02339911b33d
2014-05-12 10:59:44 -07:00
Jason Monk
18e669e5d0 Fix Global Proxy when used with PAC
Since PAC needs to relay the local proxy port back to the
ConnectivityService it ends up calling handleApplyDefaultProxy...
This works fine for PAC on WiFi, but when tested on global proxy
(not currently used anywhere), it sets the mDefaultProxy.  This
mDefaultProxy does not get cleared when the global proxy is cleared
and requires a reboot to get things cleared out.

This CL adds a check to overwrite mGlobalProxy rather than
mDefaultProxy in this use case.

Change-Id: I92782d11e213b91f8ddda2faaf996a7252273fc3
2014-05-08 13:46:26 -04:00
Jason Monk
9169e33759 Merge "Fix Docs breakage" 2014-05-07 23:16:02 +00:00
Jason Monk
4620fb81bb Fix Docs breakage
Change-Id: Idaa57d16165203ad38143e493552ddf8a1ff56e5
2014-05-07 18:41:13 -04:00
Jason Monk
18d0621adf Merge "Make proxy API public" 2014-05-07 18:54:12 +00:00
Jason Monk
1e3df5d297 Make proxy API public
Also exposed proxy-related functions that were on the
ConnectivityManager.

Change-Id: I9fb5f1bcc257a6198679ea1d56e18da2ec5a3b33
2014-05-07 14:23:53 -04:00
Bill Yi
7a7a5b5518 am 96614925: am 582d33aa: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD
* commit '966149258c0a95f390a82ada4ac95314071ff568':
  Update framework to use M33 Skia. DO NOT MERGE
2014-04-30 12:51:01 +00:00
Bill Yi
966149258c am 582d33aa: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD
* commit '582d33aa843a741374b097ac582e31075f2decd8':
  Update framework to use M33 Skia. DO NOT MERGE
2014-04-30 01:19:37 +00:00
Bill Yi
582d33aa84 Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07:00
Elliott Hughes
3080c001b5 resolved conflicts for merge of 82f8bca4 to master
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
2014-04-28 13:53:25 -07:00
Elliott Hughes
82f8bca44c am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
2014-04-28 18:36:53 +00:00
Elliott Hughes
7ab8162420 Track libcore.os' move to android.system.
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
2014-04-28 11:11:32 -07:00
Christopher Lane
70cafe1b52 resolved conflicts for merge of 381ac080 to master
Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21
2014-04-14 15:14:01 -07:00
Christopher Lane
2ac2ff8f74 Add support for custom TXT records in NSD
Change-Id: I8e6dc9852ad4d273c71ad6a63a7fbd28a206806d
2014-04-14 14:10:36 -07:00
Robert Greenwalt
add1fb69e0 am 4455c599: (-s ours) am 7482d1f5: am e1d4847c: am e359c567: am 48ee02c9: (-s ours) am 8af2d559: am 703fc413: am c0274fbe: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit '4455c5999f72daaf6f15c4394e413976f14337d3':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:59:05 +00:00
Robert Greenwalt
574d7a0c98 am f00b906f: (-s ours) am d4f3279c: am c855a28a: am 9b2dc4a4: am 8720396a: (-s ours) am d3e9af7e: am 1ab38f65: am 7ad36cd3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am d4df4032: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit 'f00b906f01319a8177d2e2ab109ff01016b0bf4c':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:50:46 +00:00
Robert Greenwalt
7482d1f523 am e1d4847c: am e359c567: am 48ee02c9: (-s ours) am 8af2d559: am 703fc413: am c0274fbe: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit 'e1d4847c120f4ab72b3acfed17c0015bdb2befaf':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:46:58 +00:00
Robert Greenwalt
d4f3279c68 am c855a28a: am 9b2dc4a4: am 8720396a: (-s ours) am d3e9af7e: am 1ab38f65: am 7ad36cd3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am d4df4032: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit 'c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:37:38 +00:00
Robert Greenwalt
e359c56733 am 48ee02c9: (-s ours) am 8af2d559: am 703fc413: am c0274fbe: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit '48ee02c908b6e03d24eb7f42398afacf01454c4a':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:34:49 +00:00
Robert Greenwalt
48ee02c908 am 8af2d559: am 703fc413: am c0274fbe: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit '8af2d559d16c73c66107c67fbf382fcb6220435d':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:27:50 +00:00
Robert Greenwalt
9b2dc4a4f8 am 8720396a: (-s ours) am d3e9af7e: am 1ab38f65: am 7ad36cd3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am d4df4032: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '8720396ab29326396cbdc80c1e6636de11ee5527':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:26:35 +00:00
Robert Greenwalt
8af2d559d1 am 703fc413: am c0274fbe: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit '703fc413d2f70fc53bc4c42593a7b46f79def897':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:21:52 +00:00
Robert Greenwalt
8720396ab2 am d3e9af7e: am 1ab38f65: am 7ad36cd3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am d4df4032: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit 'd3e9af7eb4b7463ee42492ed104c20170f2fbdef':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:18:41 +00:00
Robert Greenwalt
703fc413d2 am c0274fbe: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit 'c0274fbe7c99017c2631728d7370a54591acda44':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:16:15 +00:00
Robert Greenwalt
d3e9af7eb4 am 1ab38f65: am 7ad36cd3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am d4df4032: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '1ab38f65294146e85700f5dfdd549e5f28a6b4aa':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:12:56 +00:00
Robert Greenwalt
c0274fbe7c am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit '2c90609c0bddb6fbe255e5632a1e6639e760290f':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:09:33 +00:00
Robert Greenwalt
1ab38f6529 am 7ad36cd3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am d4df4032: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '7ad36cd3c3d08b9e1ddc56ff1c201a5a3f7ddde2':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:07:10 +00:00
Robert Greenwalt
7ad36cd3c3 am 106627e0: am e42ce676: am ebf23a8d: am d4df4032: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '106627e07cecfa8a9bcc43578fde78652fc59eba':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:00:33 +00:00
Robert Greenwalt
3f829bc362 am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit 'f8c2a0254404d29ad3c0dad4aba55b3bc1204abf':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 19:47:49 +00:00
Robert Greenwalt
f8c2a02544 am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit '7f6d1ef7d85327c80f9539cc17895fe61cba2016':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 19:42:49 +00:00
Robert Greenwalt
7f6d1ef7d8 am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit '8eac056f75f09ecdbc2fe550b6e05c8d6fd30398':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 19:36:54 +00:00
Robert Greenwalt
d4df40321c am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '3c417fbf21133340cbbe3539d87c453f81ae3a9d':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 19:36:44 +00:00