Commit graph

13,045 commits

Message SHA1
Merge "Remove listen requests properly." into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-08-25 23:12:46 +00:00
286ed87824
Remove listen requests properly.
https://googleplex-android-review.googlesource.com/#/c/527772/
correctly stopped adding listen requests to the mNetworkForRequestId
sparse array, but when we remove requests, if it's not getting
serviced by a network, we don't remove it from the network.  That
means that when we go to send a notification for that network we have
a request affiliated with the network, but don't have data for the
request and hit this NPE.

If it's not a request, don't do the optimization and remove it only
from the network servicing the request, but instead scan all networks
and remove it from each, if found.

bug:17239054
Change-Id: I49165ed08c224ef20f703469f9ce39df5f21b163

Robert Greenwalt   commited 2014-08-25 15:42:10 -07:00
bc5794d2ae
Merge "Update the http proxy on LinkProperty change." into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-08-25 19:05:00 +00:00
79c10d2e56
Merge "Remove captive portal sign-in actions." into lmp-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-08-25 18:52:32 +00:00
639218d936
merge in master-release history after reset to a30517e3806c3c83dab975d9d3922064b297cb29
The Android Automerger   commited 2014-08-24 05:51:20 -07:00
c06ff3279b
Update the http proxy on LinkProperty change.
bug:16308315
Change-Id: Ie44634a9223f289903c09653f77a998d3a344654

Robert Greenwalt   commited 2014-08-23 09:51:35 -07:00
63815c59c5
merge in master-release history after reset to a30517e3806c3c83dab975d9d3922064b297cb29
The Android Automerger   commited 2014-08-23 05:53:09 -07:00
ab72f5a80e
Merge "Allow NetworkRequest release from the system process." into lmp-dev
Jeff Davidson   authored and   Android (Google) Code Review   commited 2014-08-22 16:52:33 +00:00
222d91c66b
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

Paul Jensen   commited 2014-08-22 09:42:56 -04:00
1621687ffa
Merge "Rework the per-network URL API." into lmp-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2014-08-22 03:07:28 +00:00
9f1f10b155
Rework the per-network URL API.
This addresses API council comments.

Bug: 17112978
Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0

Lorenzo Colitti   commited 2014-08-21 19:09:27 -07:00
5b2a2e3901
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

Jeff Davidson   commited 2014-08-21 16:21:29 -07:00
7af793a5c3
Merge "Change the NetworkInfo for disconnected types." into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-08-21 21:02:19 +00:00
140517a1c7
Change the NetworkInfo for disconnected types.
Don't send out NetworkInfos with UNKNOWN state for disconnected
networks - use DISCONNECTED.

bug:17095670
Change-Id: I863bebadc1f9a666572958b49d5e62809f485e5d

Robert Greenwalt   commited 2014-08-21 09:19:46 -07:00
7d5756de8c
Merge "Fix findConnectionTypeForIface." into lmp-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2014-08-21 16:08:11 +00:00
a2d08df0a6
merge in master-release history after reset to fbb02b7fa415e38066486503aec09affbd340e92
The Android Automerger   commited 2014-08-21 05:52:11 -07:00
9c40898d05
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

Lorenzo Colitti   commited 2014-08-20 09:11:14 -07:00
f47cdb166a
merge in master-release history after reset to d2d70b5617c9679fd57f117ab7e638a55a36ac32
The Android Automerger   commited 2014-08-20 05:53:44 -07:00
889d292db6
Added notification color to all system notifications
Bug: 17128331
Change-Id: I81a94510ef51b99916f314c0dd65852426a1fbeb

Selim Cinek   commited 2014-08-20 14:25:18 +02:00
f84112f025
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

Lorenzo Colitti   commited 2014-08-19 11:59:43 -07:00
58d028a9dc
merge in master-release history after reset to af06540a9bb81722d04f0bf75b933584be64323a
The Android Automerger   commited 2014-08-18 05:51:20 -07:00
5ab474b021
Add tcp buffer size conduit to NetworkAgent.
bug: 16549611
Change-Id: I7d97dedea2c7c1aed2eccb185645889424508591

Robert Greenwalt   commited 2014-08-17 15:14:29 -07:00
0380686903
merge in master-release history after reset to c6c643606eba8a85afcfc3c237be426b44d9b8ec
The Android Automerger   commited 2014-08-16 05:53:56 -07:00
9231168b9c
Merge "Avoid reusing a currently active NetID." into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-08-16 04:32:18 +00:00
657214a0a9
Merge "Fix listening NetworkRequests to listen for all networks." into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-08-20 20:15:45 +00:00
0584b0615c
Merge "Fix CS/NetworkMonitor race." into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-08-20 20:15:45 +00:00
bcb17155a2
Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev
Jeff Davidson   authored and   Android (Google) Code Review   commited 2014-08-20 21:47:20 +00:00
73036b6916
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

Jeff Davidson   commited 2014-08-20 16:55:28 -07:00
e038610ff1
Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev
Diego Pontoriero   authored and   Android (Google) Code Review   commited 2014-08-20 21:47:20 +00:00
ae0ba4ba5c
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

Paul Jensen   commited 2014-08-20 19:23:59 +00:00
acea31b3b2
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

Robert Greenwalt   commited 2014-08-20 09:30:15 -07:00
cf97185784
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

Paul Jensen   commited 2014-08-20 14:46:11 +00:00
3a54e96e43
Fix a logic error so mtu works.
bug:17046179
Change-Id: I744a2fd425627da16d9779df3a96541506e0b6b3

Robert Greenwalt   commited 2014-08-15 17:53:05 -07:00
4b7145b4a7
Merge "Configure MTU based on network MTU parameter" into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-08-15 19:10:34 +00:00
b89454ddc0
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

w19976   authored and   Robert Greenwalt   commited 2014-08-14 20:34:13 -07:00
c3455c365a
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

Jeff Sharkey   commited 2014-08-14 22:42:27 +00:00
3318b056eb
merge in master-release history after reset to 5cf541805d4187ba3d84378a02dbec2dc3ba6907
The Android Automerger   commited 2014-08-14 06:04:12 -07:00
7e1b92080f
Made AlarmClockInfo a nested class in AlarmManager
Bug: 16959028
Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec

Jose Lima   authored and   Jose Ricardo Lima   commited 2014-08-14 02:10:41 +00:00
765b3ba313
Merge "Don't send NetworkMonitor bcast until systemReady" into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-08-13 23:16:37 +00:00
1d40f06ebe
Don't send NetworkMonitor bcast until systemReady
bug:16913951
Change-Id: I26c5c3353c2d8821452f81765875958d5b9d385b

Robert Greenwalt   commited 2014-08-13 13:43:32 -07:00
61af23aa40
merge in master-release history after reset to e4a8309101d09bfc72e76ff7fbf88c4cff283e0e
The Android Automerger   commited 2014-08-13 05:53:24 -07:00
b19afa9be2
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

Lorenzo Colitti   commited 2014-08-13 21:17:20 +09:00
4a0ff0272c
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

Robert Greenwalt   commited 2014-08-12 14:51:48 -07:00
824de8899d
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

Diego Pontoriero   commited 2014-08-12 13:15:20 -07:00
360a42636f
merge in master-release history after reset to 82e25bb6e6d0e14bb0ce2d7d7319719a5c21aa85
The Android Automerger   commited 2014-08-12 05:52:24 -07:00
e1f1c59d36
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

Jeff Sharkey   commited 2014-08-11 18:40:23 -07:00
b0b27627f5
merge in master-release history after reset to aafbe51719f92042ad95f6de617c1fe658c9405a
The Android Automerger   commited 2014-08-10 05:50:42 -07:00
fd27b91815
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

Robert Greenwalt   commited 2014-08-07 22:31:05 +00:00
b264cd8caa
merge in master-release history after reset to e81eae72bf2c5fc3e57669eddf3c6b51288510cd
The Android Automerger   commited 2014-08-07 05:50:47 -07:00
4f263510b7
Stop ConnectivityService from talking to netd about uncreated networks.
This avoids logged netd errors that are red-herrings.

bug:16667349
Change-Id: I5d6f1681f1d38dab0af4c535573a0c45c0216603

Paul Jensen   commited 2014-08-07 02:44:51 +00:00
956fa9fd02