joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity
1,278 commits 1 branch 0 tags 204 MiB
Commit graph

1,278 commits

This branch
This branch
All branches
Message SHA1
Add Multinetwork API 
Change-Id: I3a9cef0d416db96d05098dd989ee3fef3b1e9274
(cherry picked from commit d2a1edf5369707b53f63778a029bf70c25551bb6)

Robert Greenwalt   commited 2014-05-14 13:06:56 +00:00
2bebbfb357
Handle legacy synchronous inspectors 
getNetworkInfo, getActiveNetworkInfo, etc

Conflicts:
	services/core/java/com/android/server/ConnectivityService.java

Change-Id: I4611d6481b1a76fe4a4ce22232a2a329de2a6e0c

Robert Greenwalt   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:35 -07:00
54d534f96c
Get clatd/Nat464Xlat working with new NetworkAgents. 
Change-Id: I65dfb59ce519a42bdb872940d229039b5403fd92

Paul Jensen   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:35 -07:00
7d854049c8
Fix compile errors after merge. 
These are due to changes to ConnectivityService that were made
after master-multinetwork-dev branched off. They mostly didn't
cause merge conflicts because they were in different parts of
the file from the multinetwork changes, but they cause compile
errors now. These particular changes should be fine - they are
all in dead code anyway, and their functionality had already
been re-implemented in the new code.

Change-Id: I0ac9e39c3c975c8e8dc04ad11b6b85366693865c

Lorenzo Colitti   commited 2014-05-14 03:56:34 -07:00
0980701a6b
Disable calls to MobileDataStateTracker.isProvisioning() as there is no more 
MobileDataStateTracker so these just crash.

Change-Id: Ib45a85db505c0a99fb65d9a6d0c39b860f9d019d

Paul Jensen   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:34 -07:00
c72bce7591
Add NetworkMonitor. 
At present the network evaluation / captive portal detection
is disabled pending addition of API to bind socket to network.

Change-Id: I5d1f5dc86d4dd9481d52dd45d6da0732054c8315

Paul Jensen   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:34 -07:00
3842b5276e
Separate network and interface addition/removal netd APIs. 
This should facilitate stacked interfaces (i.e. clatd).

Change-Id: Ib3e7a4d3847ef6ec4449451f6da42e75959baa4f

Paul Jensen   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:34 -07:00
6b19753e89
Enabling internal msg apis 
NetworkFactory and NetworkAgent.  First trying with wifi and
getting rid of WifiStateTracker.

Conflicts:
	api/current.txt
	services/core/java/com/android/server/ConnectivityService.java

Change-Id: I7f0ec13d7d8988b32f3c6dc71f72012f3349fe02

Robert Greenwalt   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:34 -07:00
db6fac5aad
Fix build. 
Change-Id: I5dab09d2d8a9cff56fa17bb4e8c14b365449399b

Sreeram Ramachandran   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:33 -07:00
9ccfb02776
Specify netId when adding/removing routes. 
Change-Id: I07fd950aee726e9721153f75c3e4c10d8e19d8e9

Sreeram Ramachandran   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:33 -07:00
a5b0928e5a
Set and clear the default network. 
Change-Id: I305951e0c4735d708804baa597cc2d9b10f501c0

Sreeram Ramachandran   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:33 -07:00
a5c33ff4f2
Get ConnectivityServiceTest building again after 307dd58. 
Change-Id: I4520011ba2076d8fac1ca234cb9a79c774992671

Paul Jensen   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:33 -07:00
e54dc09048
Use NetId instead of interface name when communicating DNS changes to netd. 
Change-Id: Ic82b73de6f50d39d56c5e1a32f5b1f3ebb80bb7d

Paul Jensen   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:33 -07:00
5996033e08
Stop adding host routes for dns 
bug:13550136
Change-Id: I748e13b96dab111f8f6a4b11d9beaf2a72d0742b

Robert Greenwalt   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:32 -07:00
f80067d790
Merge "Add Network-specific host name resolution API."
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-05-14 05:39:10 +00:00
a4e602ed6a
Add NetworkFactory support. 
This is a protocol allowing transports to dynamically register with CS for
Handler to Handler communications.

bug:13885501
Change-Id: Ic7275e3724a15efc7e5f80981560c4cb3106007b

Robert Greenwalt   commited 2014-05-13 21:21:49 -07:00
948aea53b0
Add Network-specific host name resolution API. 
Change-Id: I932f73158a8f6e3ccc36c319d138180dff2aa070

Paul Jensen   commited 2014-05-13 19:05:13 -04:00
d4d7a2e361
Merge "Switch PacUrl storage from String to Uri"
Jason Monk   authored and   Android (Google) Code Review   commited 2014-05-13 15:14:50 +00:00
d60aeb7dea
Comment out some new netd calls to fix networking. 
bug:14869053
Change-Id: Ifc44f3cbadd0402c7b06e01962695e6b65dc48b3

Robert Greenwalt   commited 2014-05-13 06:34:23 -07:00
af0903c92d
Merge "Add has* utility functions to NetworkCapabilities"
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-05-13 01:35:02 +00:00
2d3cabca36
Add has* utility functions to NetworkCapabilities 
Change-Id: Icf735b778a3956812be522db39c29cf54c757a25

Robert Greenwalt   commited 2014-05-12 18:32:22 -07:00
e645d4a8f8
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

Lorenzo Colitti   authored and   Robert Greenwalt   commited 2014-05-12 18:06:47 -07:00
356463ad36
Add NetworkRequest to the multinetwork API 
bug:13885501
Change-Id: I7b9a01aadf26b6ff104d088b6e283c838ec4dfac

Robert Greenwalt   commited 2014-05-12 17:52:48 -07:00
a4e1c494f8
Replace LinkCapabilities with NetworkCapabilities 
Also remove unused LinkSocket and LinkSocketNotifier.
bug:13885501

Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3

Robert Greenwalt   commited 2014-05-12 16:52:56 -07:00
4d97cb04ba
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

Jason Monk   commited 2014-05-12 15:44:32 -04:00
60a0e16e09
Add NetworkCapabilities part of API. 
Merging to master, adding @hide until we're ready to reveal the API change.

bug:13885501
Change-Id: Ib40e28092e092630bfec557bde77f58eec8ae1c8

Robert Greenwalt   commited 2014-05-12 12:12:57 -07:00
6b0e2a98e4
First pass on multinetwork framework 
Starting to switch netd to use NetId.
Adding the Network identifying class

bug:13550136
Change-Id: Ie0db4fb17c9300bfafb63329adfa02339911b33d

Robert Greenwalt   commited 2014-05-12 10:59:44 -07:00
a1402dfa04
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

Jason Monk   commited 2014-05-08 13:46:26 -04:00
18e669e5d0
Merge "Fix Docs breakage"
Jason Monk   authored and   Android (Google) Code Review   commited 2014-05-07 23:16:02 +00:00
9169e33759
Fix Docs breakage 
Change-Id: Idaa57d16165203ad38143e493552ddf8a1ff56e5

Jason Monk   commited 2014-05-07 18:41:13 -04:00
4620fb81bb
Merge "Make proxy API public"
Jason Monk   authored and   Android (Google) Code Review   commited 2014-05-07 18:54:12 +00:00
18d0621adf
Make proxy API public 
Also exposed proxy-related functions that were on the
ConnectivityManager.

Change-Id: I9fb5f1bcc257a6198679ea1d56e18da2ec5a3b33

Jason Monk   commited 2014-05-07 14:23:53 -04:00
1e3df5d297
am 96614925: am 582d33aa: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD 
* commit '966149258c':
  Update framework to use M33 Skia. DO NOT MERGE

Bill Yi   authored and   Android Git Automerger   commited 2014-04-30 12:51:01 +00:00
7a7a5b5518
am 582d33aa: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD 
* commit '582d33aa84':
  Update framework to use M33 Skia. DO NOT MERGE

Bill Yi   authored and   Android Git Automerger   commited 2014-04-30 01:19:37 +00:00
966149258c
Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD
Bill Yi   commited 2014-04-29 16:07:29 -07:00
582d33aa84
resolved conflicts for merge of 82f8bca4 to master 
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210

Elliott Hughes   commited 2014-04-28 13:53:25 -07:00
3080c001b5
am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system." 
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.

Elliott Hughes   authored and   Android Git Automerger   commited 2014-04-28 18:36:53 +00:00
82f8bca44c
Track libcore.os' move to android.system. 
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d

Elliott Hughes   commited 2014-04-28 11:11:32 -07:00
7ab8162420
resolved conflicts for merge of 381ac080 to master 
Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21

Christopher Lane   commited 2014-04-14 15:14:01 -07:00
70cafe1b52
Add support for custom TXT records in NSD 
Change-Id: I8e6dc9852ad4d273c71ad6a63a7fbd28a206806d

Christopher Lane   commited 2014-04-14 14:10:36 -07:00
2ac2ff8f74
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

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:59:05 +00:00
add1fb69e0
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

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:50:46 +00:00
574d7a0c98
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

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:46:58 +00:00
7482d1f523
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

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:37:38 +00:00
d4f3279c68
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 '48ee02c908':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:34:49 +00:00
e359c56733
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 '8af2d559d1':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:27:50 +00:00
48ee02c908
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 '8720396ab2':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:26:35 +00:00
9b2dc4a4f8
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 '703fc413d2':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:21:52 +00:00
8af2d559d1
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 'd3e9af7eb4':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:18:41 +00:00
8720396ab2
am c0274fbe: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs 
* commit 'c0274fbe7c':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:16:15 +00:00
703fc413d2