Commit Graph

2058 Commits

Author SHA1 Message Date
The Android Automerger
e6b29e7054 merge in master-release history after reset to f0742ae95da5729ef5172ba3b850007341f45c27 2014-10-29 05:53:01 -07:00
Erik Kline
143e89c2f1 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
2014-10-29 19:11:58 +09:00
Lorenzo Colitti
67118eb4df 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
2014-10-29 01:23:26 +09:00
The Android Automerger
369449e226 merge in master-release history after reset to f0742ae95da5729ef5172ba3b850007341f45c27 2014-10-28 05:54:55 -07:00
Erik Kline
a7691fcb44 Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev 2014-10-28 07:53:37 +00:00
Lorenzo Colitti
846ae01231 Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 2014-10-28 07:00:31 +00:00
Lorenzo Colitti
3825843c73 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
2014-10-28 15:13:57 +09:00
Erik Kline
8b02307fd5 (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
2014-10-28 14:47:42 +09:00
Jeff Sharkey
c0e5d839a9 Follow API removal.
Bug: 18118003
Change-Id: Iad73ce748e05ba0660246e8dbb041415c187f792
2014-10-27 14:53:40 -07:00
The Android Automerger
36d15d4cc2 merge in master-release history after reset to fb9ac4c2d358278f9387b9518d5d1321f20c0e8c 2014-10-27 05:52:16 -07:00
The Android Automerger
79b56aee74 merge in master-release history after reset to fb9ac4c2d358278f9387b9518d5d1321f20c0e8c 2014-10-26 05:51:51 -07:00
The Android Automerger
a6cb6bd79c merge in master-release history after reset to fb9ac4c2d358278f9387b9518d5d1321f20c0e8c 2014-10-25 05:52:29 -07:00
Narayan Kamath
923d9a405c Merge "Deprecate more apache-http." into lmp-mr1-dev 2014-10-24 08:58:45 +00:00
Narayan Kamath
38c2dc3b49 Deprecate more apache-http.
bug: 18067888

Change-Id: I50511d53dfc9ae236dfb1646c55a5dd7fa15d7b2
2014-10-23 17:43:05 +01:00
Sreeram Ramachandran
76a545ffc4 Add an API to select a network for a DatagramSocket.
Mirrors the API that does this for Sockets.

Bug: 18076907
Change-Id: Ifa27b39e23797558546aab751fbfb3aed3b7dbcb
2014-10-23 08:37:33 -07:00
The Android Automerger
2596bc8358 merge in master-release history after reset to 7adffa1cbc073507de25b65f0aa2501ea05c5a58 2014-10-18 05:53:25 -07:00
Lorenzo Colitti
31558633b3 am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '28dcf0345b2857884c1f1639fadb720318445187':
  Propagate network state changes to the LockdownVpnTracker.
2014-10-16 09:23:17 +00:00
Lorenzo Colitti
35495fadb1 Propagate network state changes to the LockdownVpnTracker.
Bug: 17695048
Change-Id: I10378df0ab545729a6a315fd1bc8870cd98f47b3
2014-10-16 01:16:50 +09:00
The Android Automerger
f0b056e339 merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6 2014-10-14 05:52:22 -07:00
The Android Automerger
47fdc0dd7c merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6 2014-10-13 05:51:53 -07:00
The Android Automerger
ea84565278 merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6 2014-10-12 05:51:34 -07:00
The Android Automerger
ffb98bd483 merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6 2014-10-11 05:51:57 -07:00
The Android Automerger
1bd7d5a537 merge in master-release history after reset to master 2014-10-06 06:05:15 -07:00
The Android Automerger
357fd56d99 merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f 2014-10-05 05:51:14 -07:00
The Android Automerger
3c37cb4365 merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f 2014-10-04 05:51:27 -07:00
Robert Greenwalt
cd33c65aca am f393e491: Merge "Switch the NetworkInfo.mIsAvailable default" into lmp-dev
* commit 'f393e4910b42b2c9fd4dd6f970455649e00902e5':
  Switch the NetworkInfo.mIsAvailable default
2014-10-03 23:53:29 +00:00
Robert Greenwalt
458470fb16 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
2014-10-03 16:05:36 -07:00
Robert Greenwalt
db4908dc1c am 707d0288: Merge "Send callbacks for Net property changes" into lmp-dev
* commit '707d028804d968bec423f0b8b2c007c4a82ff222':
  Send callbacks for Net property changes
2014-10-03 15:41:04 +00:00
Robert Greenwalt
707d028804 Merge "Send callbacks for Net property changes" into lmp-dev 2014-10-03 15:36:39 +00:00
Robert Greenwalt
e525a0a7f7 Send callbacks for Net property changes
LinkProperties and NetworkCapabilities changes were not calling app callbacks.

bug:17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f
2014-10-02 21:05:44 -07:00
Paul Jensen
577d5005fc am b2a1ae10: Merge "Send updated NetworkAgent score to NetworkFactories when validated." into lmp-dev
* commit 'b2a1ae1042e6b40c1c8122ba77a96e06084068c0':
  Send updated NetworkAgent score to NetworkFactories when validated.
2014-10-03 02:22:25 +00:00
Paul Jensen
cdefb481da am a3c579e7: Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-dev
* commit 'a3c579e781de16edade627fedf76adb2ff2aaf3f':
  Allow any unvalidated Network to satisfy NetworkRequests.
2014-10-03 02:22:21 +00:00
Paul Jensen
b2a1ae1042 Merge "Send updated NetworkAgent score to NetworkFactories when validated." into lmp-dev 2014-10-03 02:18:12 +00:00
Paul Jensen
a3c579e781 Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-dev 2014-10-03 02:16:44 +00:00
Jason Monk
cd7cb4df35 am 51900639: Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev
* commit '519006395204ba3eab77ae420d20eb70ebb78af5':
  Synchronize on all sendProxyBroadcast calls
2014-10-02 22:42:58 +00:00
Jason Monk
e3a7ae6118 Synchronize on all sendProxyBroadcast calls
To avoid race conditions.  Also make mDefaultProxy volatile for
safety.

Bug: 17697364
Change-Id: I8f0abb1a6e1c816f3addc11a69ff794ad767f2cf
2014-10-02 15:39:38 -04:00
Paul Jensen
af94b9855b 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
2014-10-02 11:06:43 -04:00
Paul Jensen
0fa1abf72d 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
2014-10-02 10:56:51 -04:00
The Android Automerger
c9af823264 merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f 2014-10-02 05:53:09 -07:00
Sreeram Ramachandran
4da0928822 am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev
* commit '5aaabc0fa66dd755843f040fe634962477107950':
  Send app permissions to netd.
2014-10-02 06:29:37 +00:00
Sreeram Ramachandran
ae6c5079a5 Send app permissions to netd.
Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
2014-10-01 20:22:34 -07:00
The Android Automerger
9ae5c3e51e merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f 2014-10-01 05:53:04 -07:00
Lorenzo Colitti
d58b52d695 am d4a26e96: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
* commit 'd4a26e96c2e7f53c5a4f842bd2d04b28242b6611':
  Update LegacyTypeTracker state before sending connect broadcasts.
2014-10-01 00:52:34 +00:00
Lorenzo Colitti
d4a26e96c2 Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 2014-09-30 03:05:49 +00:00
Paul Jensen
72426b6194 am ebeaecde: Move mobile provisioning APN support into telephony.
* commit 'ebeaecde71b34ba32a2cc602c09e4822b8ecbf97':
  Move mobile provisioning APN support into telephony.
2014-09-29 20:47:32 +00:00
The Android Automerger
a2d9afec1f merge in master-release history after reset to 85316d155b469b1a26da61826a02801609571f90 2014-09-29 05:52:24 -07:00
Paul Jensen
ebeaecde71 Move mobile provisioning APN support into telephony.
Most of this logic is simply removed from ConnectivityService.
The captive portal detection is now done by the NetworkMonitor.
The notification logic is still left in ConnectivityService as
it's used by both the NetworkMonitor and telephony's mobile
provisioning logic.

bug:17324098

Change-Id: Ibd1c42b1a75795f90a6483d3d0a5a14f88b193d8
2014-09-29 11:37:43 +00:00
Lorenzo Colitti
4b584064d2 Update LegacyTypeTracker state before sending connect broadcasts.
Currently, LegacyTypeTracker sends out connected broadcasts
before updating its internal lists of networks. This creates a
race condition where an app can query LegacyTypeTracker state
(e.g., via getActiveNetworkInfo) as soon as it gets the
broadcast, and get information that has not been updated.

Bug: 17540101
Change-Id: Iefd6d5e9fd0b427c5872166208831f70fcef8b6f
2014-09-29 20:15:33 +09:00
The Android Automerger
dcd437c5f2 merge in master-release history after reset to fffcad067ab388f399e20a28d22bed31f76849d3 2014-09-27 05:52:30 -07:00
The Android Automerger
49b7794fcf merge in master-release history after reset to 75b0ba6db2238cb14e5d1d162df0422631a3c8a5 2014-09-25 05:51:59 -07:00