Commit graph

1,716 commits

Message SHA1
merge in master-release history after reset to 021e5db2b626626566fec7921ec9cbeae865106c
The Android Automerger   commited 2014-11-03 05:54:30 -08:00
086db99fae
merge in master-release history after reset to f0742ae95da5729ef5172ba3b850007341f45c27
The Android Automerger   commited 2014-11-02 05:52:20 -08:00
a8fa55383c
merge in master-release history after reset to f0742ae95da5729ef5172ba3b850007341f45c27
The Android Automerger   commited 2014-11-01 05:52:28 -07:00
316b861b50
Merge "Enable 464xlat on wifi." into lmp-mr1-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2014-10-30 13:28:03 +00:00
1f4c3496f3
Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2014-10-30 13:27:54 +00:00
878bafa7fb
merge in master-release history after reset to f0742ae95da5729ef5172ba3b850007341f45c27
The Android Automerger   commited 2014-10-30 05:52:37 -07:00
0a663780b1
Enable 464xlat on wifi.
Bug: 12111730
Change-Id: If6d118a3c6e163262b09cc2fb3e3d3f9a81986ec

Lorenzo Colitti   commited 2014-10-30 20:31:27 +09:00
4061f43322
Add support for running 464xlat on wifi as well.
1. Add a command to NetworkManagementService to enable/disable
   IPv6 ND offload via netd.
2. Make Nat464Xlat enable offload if clatd successfully comes up
   on a wifi network (which means it detected a NAT64), and
   correspondingly re-enable offload when the clatd interface
   goes down.

This change does not enable clatd on wifi yet, that requires an
extra 2 lines to enable it.

Bug: 12111730
Change-Id: I4318611762a37487c9a84f8c4867ec5aece98be8

Lorenzo Colitti   commited 2014-10-30 20:31:26 +09:00
475674dc24
merge in master-release history after reset to f0742ae95da5729ef5172ba3b850007341f45c27
The Android Automerger   commited 2014-10-29 05:53:01 -07:00
c883899a32
Treat optimistic addresses as global preferred.
If the kernel sends notification of an optimistic address then
treat is a useable address (isGlobalPreferred()).

Note that addresses flagged as IFA_F_OPTIMISTIC are
simultaneously flagged as IFA_F_TENTATIVE (when the tentative
state has cleared either DAD has succeeded or failed, and both
flags are cleared regardless).

Additionally: do not consider RFC 4193 ULA addresses sufficient
for "global preffered".  They are, by definition, of global scope
but not sufficient for global reachability.

Bug: 17769720
Change-Id: I759623b28fd52758f2d4d76d167f3cafd9319d6a

Erik Kline   commited 2014-10-29 19:11:58 +09:00
c17b528359
Support more than one clatd at a time.
1. Make Nat464Xlat a per-network object, one for every network
   requiring clat, instead of a ConnectivityService singleton.
2. Make the NetworkManagementService clatd commands take an
   interface.
3. When we attempt to start clatd on a network, store its
   Nat464Xlat object in the NetworkAgentInfo, so we have an
   authoritative way of knowing whether clat is running on a
   given network.
4. Rework Nat464Xlat, hopefully simplifying it.

Bug: 12111730
Change-Id: I1fa5508ef020cd1c3d1c7a1f7b06370ac5fc2ae2

Lorenzo Colitti   commited 2014-10-29 01:23:26 +09:00
f46af8efdd
merge in master-release history after reset to f0742ae95da5729ef5172ba3b850007341f45c27
The Android Automerger   commited 2014-10-28 05:54:55 -07:00
77736d1d4a
Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev
Erik Kline   authored and   Android (Google) Code Review   commited 2014-10-28 07:53:37 +00:00
922e8de38c
Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2014-10-28 07:00:31 +00:00
a06675a2b5
Change removeStackedLink to take an interface name.
This simplifies callers.

Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.

Bug: 12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e

Lorenzo Colitti   commited 2014-10-28 15:13:57 +09:00
b858857706
(re)define the definition of "provisioned"
Specifically:

    [1] provide a hasIPv4(), and
    [2] a hasIPv6()

each of which requires an IP address, a default route, and
address-family-specific DNS servers to evaluate to true.

Additionally:

    [3] redefine isProvisioned() to return the logical OR
        of [1] and [2] above.

Any external caller can still use any of the has*() methods to
construct its own, different definition of "provisioned".

Bug: 17769720
Change-Id: Ia692fb8508484ff403d3920c94d0e1db4563f807

Erik Kline   commited 2014-10-28 14:47:42 +09:00
ba3177845e
Follow API removal.
Bug: 18118003
Change-Id: Iad73ce748e05ba0660246e8dbb041415c187f792

Jeff Sharkey   commited 2014-10-27 14:53:40 -07:00
1680d4b7f7
merge in master-release history after reset to fb9ac4c2d358278f9387b9518d5d1321f20c0e8c
The Android Automerger   commited 2014-10-27 05:52:16 -07:00
828ddea3e5
merge in master-release history after reset to fb9ac4c2d358278f9387b9518d5d1321f20c0e8c
The Android Automerger   commited 2014-10-26 05:51:51 -07:00
55fbbb7fbc
merge in master-release history after reset to fb9ac4c2d358278f9387b9518d5d1321f20c0e8c
The Android Automerger   commited 2014-10-25 05:52:29 -07:00
04ab3a0774
Merge "Deprecate more apache-http." into lmp-mr1-dev
Narayan Kamath   authored and   Android (Google) Code Review   commited 2014-10-24 08:58:45 +00:00
b84c3a89f6
Deprecate more apache-http.
bug: 18067888

Change-Id: I50511d53dfc9ae236dfb1646c55a5dd7fa15d7b2

Narayan Kamath   commited 2014-10-23 17:43:05 +01:00
340882c665
Add an API to select a network for a DatagramSocket.
Mirrors the API that does this for Sockets.

Bug: 18076907
Change-Id: Ifa27b39e23797558546aab751fbfb3aed3b7dbcb

Sreeram Ramachandran   commited 2014-10-23 08:37:33 -07:00
2b5a213a5c
merge in master-release history after reset to 7adffa1cbc073507de25b65f0aa2501ea05c5a58
The Android Automerger   commited 2014-10-18 05:53:25 -07:00
3bc1595847
am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '28dcf0345b2857884c1f1639fadb720318445187':
  Propagate network state changes to the LockdownVpnTracker.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2014-10-16 09:23:17 +00:00
eeff8ca36f
Propagate network state changes to the LockdownVpnTracker.
Bug: 17695048
Change-Id: I10378df0ab545729a6a315fd1bc8870cd98f47b3

Lorenzo Colitti   commited 2014-10-16 01:16:50 +09:00
31c6a49c78
merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6
The Android Automerger   commited 2014-10-14 05:52:22 -07:00
19dc9b29d4
merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6
The Android Automerger   commited 2014-10-13 05:51:53 -07:00
c3e6d06177
merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6
The Android Automerger   commited 2014-10-12 05:51:34 -07:00
7052628368
merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6
The Android Automerger   commited 2014-10-11 05:51:57 -07:00
e70ed0ada6
merge in master-release history after reset to master
The Android Automerger   commited 2014-10-06 06:05:15 -07:00
c02c3e624d
merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f
The Android Automerger   commited 2014-10-05 05:51:14 -07:00
b1a3168d2e
merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f
The Android Automerger   commited 2014-10-04 05:51:27 -07:00
523c1d5df2
am f393e491: Merge "Switch the NetworkInfo.mIsAvailable default" into lmp-dev
* commit 'f393e4910b42b2c9fd4dd6f970455649e00902e5':
  Switch the NetworkInfo.mIsAvailable default

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-10-03 23:53:29 +00:00
b9f2f5bcd9
Switch the NetworkInfo.mIsAvailable default
The placeholder for disconnected networks was setting it to false, but
this technically means that we know an attempt to connect to that
network will fail (which we don't really now).  Some applications use
this an decide not to bother trying - an MMS app for example would
never send an MMS because it thinks the network is never available.

This is a L regression.

bug:17669247
Change-Id: Id6041f226da069c267c56418d42c55978c36c66f

Robert Greenwalt   commited 2014-10-03 16:05:36 -07:00
145bafa9a1
am 586413f3: Merge "Send callbacks for Net property changes" into lmp-dev
* commit '586413f351':
  Send callbacks for Net property changes

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-10-03 15:41:04 +00:00
cd66c1cd76
Merge "Send callbacks for Net property changes" into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-10-03 15:36:39 +00:00
586413f351
Send callbacks for Net property changes
LinkProperties and NetworkCapabilities changes were not calling app callbacks.

bug:17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f

Robert Greenwalt   commited 2014-10-02 21:05:44 -07:00
78ac81a8d1
am 1ee5fa8f: Merge "Send updated NetworkAgent score to NetworkFactories when validated." into lmp-dev
* commit '1ee5fa8f7b':
  Send updated NetworkAgent score to NetworkFactories when validated.

Paul Jensen   authored and   Android Git Automerger   commited 2014-10-03 02:22:25 +00:00
1e9a9cf348
am 3b66397c: Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-dev
* commit '3b66397c8c':
  Allow any unvalidated Network to satisfy NetworkRequests.

Paul Jensen   authored and   Android Git Automerger   commited 2014-10-03 02:22:21 +00:00
7e9be1fb76
Merge "Send updated NetworkAgent score to NetworkFactories when validated." into lmp-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-10-03 02:18:12 +00:00
1ee5fa8f7b
Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-10-03 02:16:44 +00:00
3b66397c8c
am 51900639: Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev
* commit '519006395204ba3eab77ae420d20eb70ebb78af5':
  Synchronize on all sendProxyBroadcast calls

Jason Monk   authored and   Android Git Automerger   commited 2014-10-02 22:42:58 +00:00
2ce84c5ff6
Synchronize on all sendProxyBroadcast calls
To avoid race conditions.  Also make mDefaultProxy volatile for
safety.

Bug: 17697364
Change-Id: I8f0abb1a6e1c816f3addc11a69ff794ad767f2cf

Jason Monk   commited 2014-10-02 15:39:38 -04:00
f326ffef6f
Send updated NetworkAgent score to NetworkFactories when validated.
Previously the score was not sent out causing other NetworkFactories
to have the lower unvalidated score and to repeatedly try to bring
up a new Network only to have it torn down.
Also, avoid logging an error when tearing down a network with only
listening requests.

bug:17726566
Change-Id: I82ff7c9bd5ec962f62a50ad0042c278622953969

Paul Jensen   commited 2014-10-02 11:06:43 -04:00
ab9bdd51c9
Allow any unvalidated Network to satisfy NetworkRequests.
Explicitly selected Networks may never be validated (e.g. Chromecast)
but are still given a high score so they can explicitly become the
default Network.  Without this fix they do not become the default
Network if another Network is present.  This was an artifact of how
unvalidated Networks were handled, but now that unvalidated Networks
are properly handled, ala 50807d, we can freely rematch even
unvalidated Networks and NetworkRequests.
Also, never linger and teardown unvalidated Networks as the user
might be in the process of signing in.  This better matches prior
behavior when unvalidated networks didn't match NetworkRequests,
and thus were never lingered.
Also, don't disconnect networks that may be lingering.  The
disconnect logic in rematchNetworkAndReqeuests() is adjusted to only
fire when a network is newly validated.
It is incorrect to consider rematching uncreated Networks and
explicitly selecting created Networks, so this change logs error
messages in those cases.

bug:17647968
bug:17396616
Change-Id: Id6b8a350b8200f484d5bfd14ca0a8f64f08846a0

Paul Jensen   commited 2014-10-02 10:56:51 -04:00
d4e077c124
merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f
The Android Automerger   commited 2014-10-02 05:53:09 -07:00
af423b41da
am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev
* commit '5aaabc0fa66dd755843f040fe634962477107950':
  Send app permissions to netd.

Sreeram Ramachandran   authored and   Android Git Automerger   commited 2014-10-02 06:29:37 +00:00
783bea432d
Send app permissions to netd.
Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02

Sreeram Ramachandran   commited 2014-10-01 20:22:34 -07:00
c5756e42a4
merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f
The Android Automerger   commited 2014-10-01 05:53:04 -07:00
15ce49eb72