Commit graph

1,639 commits

Message SHA1
Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-11-21 12:42:34 +00:00
9f8f78ca78
am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev
automerge: 0a1f0d7

* commit '0a1f0d74f2':
  Fix null handling in proxies.

Geoffrey Borggaard   authored and   android-build-merger   commited 2014-11-21 10:17:39 +00:00
7057035ccc
am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev
* commit 'c3f5d7183a21cb081bab1a6bca3fc115523e4e78':
  Fix null handling in proxies.

Geoffrey Borggaard   authored and   Android Git Automerger   commited 2014-11-20 20:59:00 +00:00
0a1f0d74f2
Fix null handling in proxies.
ProxyInfo.getPacFileUrl() can not be null.  It will be equal to
Uri.EMPTY.  Checking for null was causing global proxies to never be
disabled.  Or more accurately, global proxies would be disabled, but
would reappear after a reboot.

ProxyInfo.getExclusionListByString() can be null.  If no
exclusion list was specified, the proxy settings would not be
successfully saved, they would disappear after reboot.

Bug: 18453223
Change-Id: I1c27e5dca5b9664bb7468ea909bff489fa110a07

Geoffrey Borggaard   commited 2014-11-20 19:48:20 +00:00
21523a4de1
Rename EXTRA_NETWORK ConnectivityManager constants.
Per b/18414703:

    s/\<EXTRA_NETWORK_REQUEST_NETWORK\>/EXTRA_NETWORK/g
    s/\<EXTRA_NETWORK_REQUEST_NETWORK_REQUEST\>/EXTRA_NETWORK_REQUEST/g

Additionally, associated string values updated to:

    android.net.extra.NETWORK
    android.net.extra.NETWORK_REQUEST

Bug: 18414703
Change-Id: I7aeed2161829742affc666e835a97ce2c28356fe

Erik Kline   commited 2014-11-20 13:16:31 +09:00
fb087f1756
Don't allow an uncreated Network to satsify requests.
This could happen when another Network changes its capabilities and
updateCapabilities() calls rematchAllNetworksAndRequests() which
calls rematchNetworkAndRequests() on all Networks, even those that
are uncreated.
Allowing uncreated Networks to satisfy requests can lead to bugs
where ConnectivityService instructs netd to perform actions
(e.g. set default Network) on uncreated Networks which netd doesn't
know about yet.

bug:18446301
Change-Id: I857262ac66d1d3af4c264ce128f0a4bee95655de

Paul Jensen   commited 2014-11-19 13:11:30 -05:00
adfd0a8857
Merge "Populate 464xlat LinkProperties only when the interface comes up." into lmp-mr1-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2014-11-18 00:25:53 +00:00
3b5b0a22ea
Merge "air plane mode only send to the owner through the quick setting" into lmp-mr1-dev
xinhe   authored and   Android (Google) Code Review   commited 2014-11-17 22:18:11 +00:00
a5fd99e176
Expose a SystemApi method to prepare a VPN without consent.
This is NOT designed to be called normally. Most apps (even
system-privileged ones) should request user consent before launching a
VPN. However, it is needed to support flows where consent can be
obtained through other means external to the VPN flow itself.

The API requires a system-privileged permission, CONTROL_VPN.

Bug: 18327583
Change-Id: I1bcdcf0fb5707faeb861ec4535e7ccffea369ae7

Jeff Davidson   commited 2014-11-17 21:03:10 +00:00
59b395fd7e
air plane mode only send to the owner through the quick setting
It should send to all the uesers as it behaves in setting

Bug:18353278
Change-Id: Ib46a97e30bfba73dd78fab0c8139d6ccb7ad210f

xinhe   commited 2014-11-17 11:35:01 -08:00
51e7703ca8
Populate 464xlat LinkProperties only when the interface comes up.
Currently Nat464Xlat reads the clat IPv4 address and updates the
clat LinkProperties when the interface is created. This causes a
race condition: because clatd only sets the IPv4 address after
creating the interface, it's possible that Nat464Xlat will read
the address before clatd has set it, causing the framework to
think that the clat IPv4 address is 0.0.0.0/32.

This seems to be happening more frequently now, perhaps because
clatd takes a bit longer to configure the IPv4 address now that
it needs to check that the address is free before using it.

Fix this by making Nat464Xlat listen for the interface coming up
instead of listening for the interface being added.

Bug: 12111730
Change-Id: Ic1c59b5b6dbb851b7431d1b06885f67803373bb9

Lorenzo Colitti   commited 2014-11-10 19:33:13 -08:00
6fef3fd724
Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev
Sreeram Ramachandran   authored and   Android (Google) Code Review   commited 2014-11-06 21:57:21 +00:00
b063786c78
Implemented requestNetwork with a PendingIntent.
ConnectivityManager.requestNetwork(NetworkRequest, PendingIntent)
was unhidden and implemented.

Added ConnectivityManager.removePendingIntentRequest(PendingIntent) as
the companion method.

Bug: 17356414
Change-Id: I656a1e149cc1292c443ebfe9e61ee3eb5a80f143

Jeremy Joslin   commited 2014-11-06 11:43:27 -08:00
94c3099119
Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-11-05 23:36:01 +00:00
f70dd385e7
Fix Legacy typing of net-specific requests.
We're starting to get network requests for specific SIMs
and the Legacy Type Inference was broken because the incoming
request included a network specifier while the legacy requests
it was compared with did not.  Only compare the things we care
about.

bug:18031008
Change-Id: If107042828c152ede51a2497a3859bc1a6c83694

Robert Greenwalt   commited 2014-11-05 15:06:20 -08:00
bb12fdf118
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-11-05 19:05:09 +00:00
f59ed33835
Merge "Update network selections on capability change." into lmp-mr1-dev
Jeff Davidson   authored and   Android (Google) Code Review   commited 2014-11-05 17:41:36 +00:00
6633afee4b
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.

bug:18252947
Change-Id: I8764cb944c293e01d99822bb52b55af7e9d77853

Paul Jensen   commited 2014-11-05 09:35:26 -05:00
f084aea4d7
Update network selections on capability change.
Among other reasons, this is needed when a Wi-Fi connection is
upgraded from untrusted to trusted, so that the default route can be
updated to point to the Wi-Fi network instead.

Bug: 18206275
Change-Id: I53f7a6f00f66a23ae4873fa2334cd8a621f39d4f

Jeff Davidson   commited 2014-11-04 16:48:27 -08:00
ee17a4ec14
Don't use framework permission strings for netd permissions.
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.

Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517

Sreeram Ramachandran   commited 2014-11-04 10:15:03 -08:00
d84f7f863c
Send broadcasts when VPNs come and go.
This is achieved by adding TYPE_VPN as a supported legacy type.
Note that this is added in code, and not in a config.xml file,
so there's no way to remove TYPE_VPN (i.e., make it unsupported).

Bug: 17426546
Change-Id: I02eb5f22737720095f646f8db5c87fd66da129d6

Sreeram Ramachandran   commited 2014-11-03 11:39:53 -08:00
1d4504357c
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
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
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 "(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 "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
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
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