Commit Graph

2091 Commits

Author SHA1 Message Date
The Android Automerger
d4e8a883fc merge in master-release history after reset to a30517e3806c3c83dab975d9d3922064b297cb29 2014-08-24 05:51:20 -07:00
Robert Greenwalt
1f358c86ef Update the http proxy on LinkProperty change.
bug:16308315
Change-Id: Ie44634a9223f289903c09653f77a998d3a344654
2014-08-23 09:51:35 -07:00
The Android Automerger
b1ba477d92 merge in master-release history after reset to a30517e3806c3c83dab975d9d3922064b297cb29 2014-08-23 05:53:09 -07:00
Jeff Davidson
e1dbb17d41 Merge "Allow NetworkRequest release from the system process." into lmp-dev 2014-08-22 16:52:33 +00:00
Paul Jensen
af9351f884 Remove captive portal sign-in actions.
This reverts commit e0101cd and removes the related NetworkMonitor code.
The thinking is the broadcasts are not robust enough as they rely on apps
working together and are not sufficiently tested.

bug:17115050
Change-Id: I433032867cc4fea7191a1b13842b16825dc74df4
2014-08-22 09:42:56 -04:00
Lorenzo Colitti
e1d81d158a Merge "Rework the per-network URL API." into lmp-dev 2014-08-22 03:07:28 +00:00
Lorenzo Colitti
45aca20cd7 Rework the per-network URL API.
This addresses API council comments.

Bug: 17112978
Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0
2014-08-21 19:09:27 -07:00
Jeff Davidson
e7906a962f Allow NetworkRequest release from the system process.
Otherwise attempts to release that are triggered by the binder death
receipient will be rejected.

Bug: 17187437
Change-Id: If3924d82dba69c572708e04c11d17ed25ae6870d
2014-08-21 16:21:29 -07:00
Robert Greenwalt
e2a28e319d Merge "Change the NetworkInfo for disconnected types." into lmp-dev 2014-08-21 21:02:19 +00:00
Robert Greenwalt
88acf6fe01 Change the NetworkInfo for disconnected types.
Don't send out NetworkInfos with UNKNOWN state for disconnected
networks - use DISCONNECTED.

bug:17095670
Change-Id: I863bebadc1f9a666572958b49d5e62809f485e5d
2014-08-21 09:19:46 -07:00
Lorenzo Colitti
209058ec6e Merge "Fix findConnectionTypeForIface." into lmp-dev 2014-08-21 16:08:11 +00:00
The Android Automerger
d3a849a996 merge in master-release history after reset to fbb02b7fa415e38066486503aec09affbd340e92 2014-08-21 05:52:11 -07:00
Lorenzo Colitti
bcc9260028 Fix findConnectionTypeForIface.
This is used by the VPN to notice when its underlying connection
has gone away. I'm fixing this using network types and not
NetworkCapabilities because

1. I don't know of a way to use the new API to get callbacks for
   a specific network. You can get them based on capabilities,
   but it's not clear how to construct a NetworkCapabilities
   object that will only match a specific network, or only match
   the default network.
2. It's a smaller change.

Bug: 15070628
Change-Id: Id6a6a183da83636c0859db4c954093bd684c01ea
2014-08-20 09:11:14 -07:00
The Android Automerger
2669f54007 merge in master-release history after reset to d2d70b5617c9679fd57f117ab7e638a55a36ac32 2014-08-20 05:53:44 -07:00
Selim Cinek
cbec2b12ca Added notification color to all system notifications
Bug: 17128331
Change-Id: I81a94510ef51b99916f314c0dd65852426a1fbeb
2014-08-20 14:25:18 +02:00
Lorenzo Colitti
ef734f8a3b Stop using LinkProperties for static configuration.
LinkProperties can represent way more complicated configurations
than what we can actually apply to interfaces. This makes it
error-prone to use it to represent static configuration, both
when trying to apply configuration coming from LinkProperties
and when trying to save configuration from current
LinkProperties.

Instead, move static configuration (IPv4 only, since we don't
support static IPv6 configuration) into a separate
StaticIpConfiguration class.

Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
2014-08-19 11:59:43 -07:00
The Android Automerger
27fa996186 merge in master-release history after reset to af06540a9bb81722d04f0bf75b933584be64323a 2014-08-18 05:51:20 -07:00
Robert Greenwalt
debf0e0075 Add tcp buffer size conduit to NetworkAgent.
bug: 16549611
Change-Id: I7d97dedea2c7c1aed2eccb185645889424508591
2014-08-17 15:14:29 -07:00
The Android Automerger
2e94795aac merge in master-release history after reset to c6c643606eba8a85afcfc3c237be426b44d9b8ec 2014-08-16 05:53:56 -07:00
Robert Greenwalt
c2e050b138 Merge "Avoid reusing a currently active NetID." into lmp-dev 2014-08-16 04:32:18 +00:00
Robert Greenwalt
d00f0350c0 Merge "Fix listening NetworkRequests to listen for all networks." into lmp-dev 2014-08-20 20:15:45 +00:00
Robert Greenwalt
06e2be06c2 Merge "Fix CS/NetworkMonitor race." into lmp-dev 2014-08-20 20:15:45 +00:00
Jeff Davidson
d89d8ecff8 Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev 2014-08-20 21:47:20 +00:00
Jeff Davidson
6047c1dc68 Less intrusive VPN dialog and other UX tweaks.
-The ability to launch VPNs is now sticky; once approved by the user,
further approvals are not needed UNLESS the connection is revoked in
Quick Settings.

-The old persistent notification has been removed in favor of the new
Quick Settings UI.

-The name of the VPN app is now pulled from the label of the VPN
service rather than the app itself, if one is set.

Bug: 12878887
Bug: 16578022
Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
2014-08-20 16:55:28 -07:00
Diego Pontoriero
b0b5d7eb83 Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev 2014-08-20 21:47:20 +00:00
Paul Jensen
46e129be74 Avoid reusing a currently active NetID.
There are only a limited number (65526) of NetIDs so the chance for reusing
one exists.  Reusing a currently active NetID will cause problems like netd
failures and overwriting entries in mNetworkForNetId.

bug:16815182

Change-Id: Ib75302beae3179c3f3b90c345cf4d2cf5f4ad2be
2014-08-20 19:23:59 +00:00
Robert Greenwalt
a6fd83dc4b Fix CS/NetworkMonitor race.
If we have a message in flight about a NetworkAgentInfo when it gets disconnected
we are left with a zombie network.  Fixes this by verifing the network is still
live before we process the msg.

bug:17142206
Change-Id: I2c94a39b3ea97c1562066571b277280c1f69f71c
2014-08-20 09:30:15 -07:00
Paul Jensen
bbfdfb007c Fix listening NetworkRequests to listen for all networks.
This is a small change but should fix a number of functional problems:
1. When registering a listening NetworkRequest and when a Network is
   validated, we should always add the listening NetworkRequest to the
   Network's list of NetworkRequests if the Network satisfies the
   NetworkRequest.  Previously in both cases this was only done for
   the highest scoring network.  This enables the listening
   NetworkRequest to listen for all networks, not just the highest
   scoring network.
2. No longer add listening NetworkRequests to mNetworkForRequestId as
   it doesn't make sense as it's a 1:1 mapping but listening
   NetworkRequests to Networks is a many:many mapping.
3. Don't "keep" a Network that's finished validating when only a
   listening NetworkRequest requests it.
4. Don't send updated scores to NetworkFactories from listening
   NetworkRequests.  NetworkFactories and NetworkAgents shouldn't
   concern themselves with listening NetworkRequests.

bug:16680764
Change-Id: Iaba14263227771e4bd84ee4bce488beaef20a8a3
2014-08-20 14:46:11 +00:00
Robert Greenwalt
22d0c6ce52 Fix a logic error so mtu works.
bug:17046179
Change-Id: I744a2fd425627da16d9779df3a96541506e0b6b3
2014-08-15 17:53:05 -07:00
Robert Greenwalt
36a05df3f3 Merge "Configure MTU based on network MTU parameter" into lmp-dev 2014-08-15 19:10:34 +00:00
w19976
e714f1daa6 Configure MTU based on network MTU parameter
Add logic to obtain the mtu from the network PCO parameter and set it to kernel
when the mobile data connection is established. When there is no PCO mtu configured
from the network, the mtu size defined in the corresponding APN will be used. In case
no mtu size is defined for an APN used for data connection, the MCC/MNC based MTU
defined  in the framework overaly will be applied.

bug:17046179
Change-Id: I6465d4b8f2076aaa380ae3617fb3f24adbe136d4
2014-08-14 20:34:13 -07:00
Jeff Sharkey
f2ceed8a54 Some networks may have null ifaces, I guess?
Seems like a bug further upstream, but guard ourselves against it
for now.

Bug: 17033841
Change-Id: Id0e5895c3389b63d4e34b1fb064efef8b72cd609
2014-08-14 22:42:27 +00:00
The Android Automerger
c865be34be merge in master-release history after reset to 5cf541805d4187ba3d84378a02dbec2dc3ba6907 2014-08-14 06:04:12 -07:00
Jose Lima
eeb0c785b1 Made AlarmClockInfo a nested class in AlarmManager
Bug: 16959028
Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec
2014-08-14 02:10:41 +00:00
Robert Greenwalt
1c9613cf01 Merge "Don't send NetworkMonitor bcast until systemReady" into lmp-dev 2014-08-13 23:16:37 +00:00
Robert Greenwalt
dc2d56124d Don't send NetworkMonitor bcast until systemReady
bug:16913951
Change-Id: I26c5c3353c2d8821452f81765875958d5b9d385b
2014-08-13 13:43:32 -07:00
The Android Automerger
170bffdc60 merge in master-release history after reset to e4a8309101d09bfc72e76ff7fbf88c4cff283e0e 2014-08-13 05:53:24 -07:00
Lorenzo Colitti
435565dd96 Switch RouteInfo to use IpPrefix instead of LinkAddress.
This addresses a TODO and also makes it possible to create
routes to destinations that are not valid LinkAddresses, such as
multicast addresses.

Bug: 16875580
Change-Id: Id4c77b00dc3064bf27d78cdcbbe035e645748cfe
2014-08-13 21:17:20 +09:00
Robert Greenwalt
59dca37d82 Remove extraneous clearing of inet condition
This was old code I missed in previous inet condition refactor
and caused us to show "not connect" icon any time we connected
to a secondary network (mms/supl/etc).

bug:16896743
Change-Id: I0fa62e09bb0b7c0ee0864bb1f95967eac5f60d3e
2014-08-12 14:51:48 -07:00
Diego Pontoriero
15e645e0fe Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API
for determining carrier app instead of MCC/MNC.

Related ConnectivityService change: http://ag/374479

Related Aeroshell change to SetupWizard: http://ag/520857

Bug: 16457806
Change-Id: I78eb2a25d578400c2de6bae4af3d6e8e1ee4d0c7
2014-08-12 13:15:20 -07:00
The Android Automerger
febcdbb8a3 merge in master-release history after reset to 82e25bb6e6d0e14bb0ce2d7d7319719a5c21aa85 2014-08-12 05:52:24 -07:00
Jeff Sharkey
0aef9341d3 Hack and ship: NetworkStats edition.
Some devices use clatd for catching raw IPv4 traffic when running on
a pure-IPv6 carrier network.  In those situations, the per-UID
stats are accounted against the clat iface, so framework users need
to combine both the "base" and "stacked" iface usage together.

This also means that policy rules (like restricting background data
or battery saver) need to apply to the stacked ifaces.

Finally, we need to massage stats data slightly:

-- Currently xt_qtaguid double-counts the clatd traffic *leaving*
the device; both against the original UID on the clat iface, and
against UID 0 on the final egress interface.

-- All clatd traffic *arriving* at the device is missing the extra
IPv6 packet header overhead when accounted against the final UID.

Bug: 12249687, 15459248, 16296564
Change-Id: I0ee59d96831f52782de7a980e4cce9b061902fff
2014-08-11 18:40:23 -07:00
The Android Automerger
0f28ec47dc merge in master-release history after reset to aafbe51719f92042ad95f6de617c1fe658c9405a 2014-08-10 05:50:42 -07:00
Robert Greenwalt
a1d68e73b9 First pass of changing statusbar connectedness
Switching from GCM-only inet condition reports to using our network
validation (captive portal check).

Note that currently the GCM signal is disconnected.  Next step is to
make the bad-network report API trigger a re-evaluation of the network
and get negative reports from the NetworkMonitor.

Change-Id: Ie2ebab1e5c04775e3c4d6738f656a6c8157dba76
2014-08-07 22:31:05 +00:00
The Android Automerger
0681ab07f5 merge in master-release history after reset to e81eae72bf2c5fc3e57669eddf3c6b51288510cd 2014-08-07 05:50:47 -07:00
Paul Jensen
74940206ed Stop ConnectivityService from talking to netd about uncreated networks.
This avoids logged netd errors that are red-herrings.

bug:16667349
Change-Id: I5d6f1681f1d38dab0af4c535573a0c45c0216603
2014-08-07 02:44:51 +00:00
Paul Jensen
9524ff39e3 Merge "Flush DNS cache when routes change." into lmp-dev 2014-08-06 21:46:55 +00:00
Paul Jensen
e0fd4a850b Flush DNS cache when routes change.
We used to do this but the change got lost in the NetworkAgent
upgrade.  This brings it back.  ConnectivityService has netd do
the actual flushing.

bug:16549455
Change-Id: I11ddd55fcb9d1ed1d2c6a9be7eb8c57e41bdbdb8
2014-08-06 22:39:40 -04:00
Paul Jensen
87d4c79ccf Remove dead CaptivePortalTracker.
Captive portals are now detected by the NetworkMonitor.

Change-Id: Ibfb04bf83b1028231397a577468f110d7ab1dc06
2014-08-07 02:32:54 +00:00
The Android Automerger
d6fc2c38a4 merge in master-release history after reset to 0e66fa8e86a8f6f5cf8b701877f41b57469fcdaa 2014-08-02 05:50:27 -07:00