Commit Graph

1206 Commits

Author SHA1 Message Date
Robert Greenwalt
162efe9964 Catch Netd exceptions to avoid runtime restart
bug:13475636
Change-Id: If36a0051a957fc066711fe8225f8981bc07add04
2014-03-19 15:17:03 -07:00
The Android Automerger
796d1a3890 merge in master-release history after reset to master 2014-03-19 05:50:08 -07:00
Ashish Sharma
5a07255d7e Update the tests to deal with the new timestamps in idletimer module.
Change-Id: I1a8368d84ef806f1501b0a1f5e817388a1d10518
2014-03-18 16:38:58 -07:00
Ashish Sharma
601fba91e3 Include elapsed realtime (nanos) of the event in the radio state change notifications.
Bug: 13247811
Change-Id: I3454aa159a68b9087b4762df947b41965b5a3941
2014-03-18 21:42:02 +00:00
The Android Automerger
7e1e7ac3a1 merge in master-release history after reset to master 2014-03-15 05:51:14 -07:00
JP Abgrall
22b42d6a84 am d47dc7c3: am 7238585e: am f118689c: am 4ecd833e: am 6f3e6dd0: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit 'd47dc7c3bd1cf9fbc549141512bc75c43454ef7c':
  ConnectivityService: add support to set TCP initial rwnd
2014-03-14 17:53:49 +00:00
Chad Brubaker
c0fbb3eb6e am ff9da494: am 4b59883a: am 5013be94: am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit 'ff9da494622a7f9358979509849ab94364d17706':
  Remove SO_BINDTODEVICE from VPN protect
2014-03-14 17:53:45 +00:00
JP Abgrall
f118689ceb am 4ecd833e: am 6f3e6dd0: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '4ecd833ee35d1120f8c1ae52367947cacfc263a4':
  ConnectivityService: add support to set TCP initial rwnd
2014-03-14 16:28:09 +00:00
Chad Brubaker
5013be94c8 am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
  Remove SO_BINDTODEVICE from VPN protect
2014-03-14 16:27:58 +00:00
Chad Brubaker
e721c5e3a8 am 0b925975: (-s ours) am 48dd8b0f: am 11a1d123: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '0b925975b88c91285df97ca26cebb8f8429ec0da':
  Only allow System apps to make VPN exempt routes
2014-03-14 10:34:30 +00:00
Chad Brubaker
b9982a2f77 am 6467e900: (-s ours) am 7f68f7f4: am fc2c67b7: am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '6467e900a1211de65ae70cc722c871987e0b6531':
  Add the calling package name to requestRouteToHost
2014-03-14 10:28:28 +00:00
JP Abgrall
6f3e6dd0a2 Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 2014-03-13 20:33:44 +00:00
Chad Brubaker
11a1d123e0 am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '7fb074389370ac93afc5830189371dc3ec26265c':
  Only allow System apps to make VPN exempt routes
2014-03-13 18:18:40 +00:00
Chad Brubaker
fc2c67b7ee am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '1011960c44a4f84d53d05199fe1ca09be9473822':
  Add the calling package name to requestRouteToHost
2014-03-13 18:18:36 +00:00
JP Abgrall
fe9b47e6d0 ConnectivityService: add support to set TCP initial rwnd
The value for the TCP initial receive window comes from,
in order,

kernel
  /proc/sys/net/ipv4/tcp_default_init_rwnd

init.rc (via properties)
  net.tcp.default_init_rwnd

properties
  net.tcp.default_init_rwnd

gservices
  Settings.Global.TCP_DEFAULT_INIT_RWND

Bug: 12020135
Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
2014-03-12 20:22:47 -07:00
Chad Brubaker
4452b850e3 Remove SO_BINDTODEVICE from VPN protect
SO_BINDTODEVICE is not needed with policy routing.
SO_BINDTODEVICE was also used on the default iface which causes problems
when the default iface is IPv6 only and the socket tries to connect to a
IPv4 address.

Bug: 12940882
Change-Id: I5b2bde0ac5459433fc5749f509072a548532f730
2014-03-11 10:58:19 -07:00
The Android Automerger
b0f3386fa3 merge in master-release history after reset to master 2014-03-06 05:49:59 -08:00
Robert Greenwalt
a8dd68fc6f am 2d07e8d6: am c1ca3bac: am 4d23e4b2: am 7a54d1df: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev
* commit '2d07e8d60e44e320b0c39d63e763d79a7befadf3':
  Only apply tcp buffer sizes for default net
2014-03-06 00:14:30 +00:00
Robert Greenwalt
4d23e4b287 am 7a54d1df: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev
* commit '7a54d1dfdc1e113fc12e3844efcb5e54b61efa90':
  Only apply tcp buffer sizes for default net
2014-03-05 22:14:46 +00:00
Chad Brubaker
6c0af46240 Only allow System apps to make VPN exempt routes
requestRouteToHost will only allow system applications to make routes
exempt from the VPN's routing rules.

If a VPN is currently running and a non-system app requests a route it
will only succeed if that host is currently covered by a VPN exempt
routing rule. Otherwise it will fail.

For example, if a VPN is running and the MMS network is brought online
those routes will be added as VPN exempt. If an application then tries
to request a route to a MMS endpoint it will succeed because the routes
already exist. If an application tries to request a route to a host
covered by the VPN the call will fail.

Bug: 12937545
Change-Id: If7bcec91bbb96c62c8fb69748c975847e6c00b6f
2014-03-05 13:35:36 -08:00
Chad Brubaker
abe885124b Add the calling package name to requestRouteToHost
The calling package name will be used to check if an application is a
system application when deciding if a route should be exempt from VPN
routing rules.

Bug: 12937545
Change-Id: I2c09c875fe9bb9685871a0a801ddcbb32fc17405
2014-03-05 13:35:20 -08:00
Robert Greenwalt
7a54d1dfdc am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev
* commit 'bad3a9e66fb103ec96ea89ce9eff7270333d5926':
  Only apply tcp buffer sizes for default net
2014-03-05 18:31:18 +00:00
The Android Automerger
a3adc77bd7 merge in master-release history after reset to master 2014-03-05 08:05:42 -08:00
Robert Greenwalt
c26eb014e0 Only apply tcp buffer sizes for default net
This may mean that secondary networks have bad network settings,
but currently default settings are overriden by secondary nets
which seems worse.

bug:13211589
Change-Id: I08d56e618208781bf6b21a88663c2b8503a4f226
2014-03-04 09:56:05 -08:00
Yuhao Zheng
58700af05a Merge "Return detailed reason of invalid proxy settings" 2014-03-04 17:43:47 +00:00
Robert Greenwalt
dfdaa016bf Merge "Only apply tcp buffer sizes for default net" 2014-03-04 17:20:18 +00:00
Yuhao Zheng
12df4ac68e Return detailed reason of invalid proxy settings
Make Proxy.validate() return valid/invalid int code, instead of throwing
exceptions. If invalid, detailed reason code is returned (currently for
Settings UI use).

bug: 13248097
Change-Id: Ic68d03f666f1cd63667afc311de7dc370d233901
2014-03-03 11:23:07 -08:00
Robert Greenwalt
9f25cdc323 Only apply tcp buffer sizes for default net
This may mean that secondary networks have bad network settings,
but currently default settings are overriden by secondary nets
which seems worse.

bug:13211589
Change-Id: I3ef1a17ccde05306d786729c4369a31f78b2ebcf
2014-03-03 10:26:11 -08:00
The Android Automerger
a10a869c02 merge in master-release history after reset to master 2014-03-01 05:50:36 -08:00
Dianne Hackborn
b4b09e8a97 Hold a wake lock while dispatching network activity events.
Also add new API for determining whether the current data network
is active, and thus better scheduling network operations.  This
API is designed to not be tied to a mobile network -- regardless
of the network, apps can use it to determine whether they should
initiate activity or wait.  On non-mobile networks, it simply always
reports as the network being active.

This changed involved reworking how the idle timers are done so
that we only register an idle timer with the current default
network.  This way, we can know whether we currently expect to
get callbacks about the network being active, or should just always
report that it is active.  (Ultimately we need to be getting this
radio active data from the radio itself.)

Change-Id: Iaf6cc91a960d7542a70b72f87a7db26d12c4ea8e
2014-02-28 15:19:39 -08:00
Chad Brubaker
7b0eca3a7d Merge "Remove SO_BINDTODEVICE from VPN protect" 2014-02-28 19:28:45 +00:00
The Android Automerger
2e8ecb34d4 merge in master-release history after reset to master 2014-02-26 05:50:00 -08:00
Robert Greenwalt
9a2ef0b576 am 8395aadb: (-s ours) am 860ac9e4: am 94d5c80a: am 635097ff: am cf73f46a: am df3b5e5b: am 3c73a8e8: (-s ours) am ca4ba835: am 41708e1c: DO NOT MERGE Sanitize WifiConfigs
* commit '8395aadbd3b2a11fac664f44c590576141c78615':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:36:45 +00:00
Robert Greenwalt
94d5c80a2b am 635097ff: am cf73f46a: am df3b5e5b: am 3c73a8e8: (-s ours) am ca4ba835: am 41708e1c: DO NOT MERGE Sanitize WifiConfigs
* commit '635097ffe64d673a69113f3f33f804223a145b44':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:25:11 +00:00
Robert Greenwalt
635097ffe6 am cf73f46a: am df3b5e5b: am 3c73a8e8: (-s ours) am ca4ba835: am 41708e1c: DO NOT MERGE Sanitize WifiConfigs
* commit 'cf73f46a514f5c2b1a0de137ed203401417307b4':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:21:50 +00:00
Robert Greenwalt
df3b5e5bda am 3c73a8e8: (-s ours) am ca4ba835: am 41708e1c: DO NOT MERGE Sanitize WifiConfigs
* commit '3c73a8e87a43b6c7159f0b531948dae8b3686dfa':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:14:26 +00:00
Robert Greenwalt
3c73a8e87a am ca4ba835: am 41708e1c: DO NOT MERGE Sanitize WifiConfigs
* commit 'ca4ba835742e7131e1ae7a4a18f3989a1e96d9ed':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 10:12:35 -08:00
Robert Greenwalt
ca4ba83574 am 41708e1c: DO NOT MERGE Sanitize WifiConfigs
* commit '41708e1c6e4bbea0bd8b240ee6fdf7e305b6d6db':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 10:09:13 -08:00
The Android Automerger
7d7c680b41 merge in master-release history after reset to master 2014-02-25 05:50:07 -08:00
Robert Greenwalt
41708e1c6e DO NOT MERGE Sanitize WifiConfigs
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data).  This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.

We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.

This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.

Bug:12663469
Change-Id: I0d92db7efc30a1bb3e5b8c6e5595bdb9793a16f2

Conflicts:
	core/java/android/net/LinkProperties.java
	services/java/com/android/server/WifiService.java
	wifi/java/android/net/wifi/WifiStateMachine.java
2014-02-24 15:20:32 -08:00
Jake Hamby
d38e37956b Remove unneeded new RIL command.
Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also remove some accidentally added debug log lines.

Bug: 12864208
Change-Id: I6f035d6900c9fcb1427bad62057d7b4a1d3cd99c
2014-02-24 12:29:53 -08:00
Jake Hamby
19ab991213 Remove unneeded new RIL command.
Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also remove some accidentally added debug log lines.

Bug: 12864208
Change-Id: I6f035d6900c9fcb1427bad62057d7b4a1d3cd99c
2014-02-24 11:42:51 -08:00
Chad Brubaker
c92e61c782 Merge "Only allow System apps to make VPN exempt routes" 2014-02-24 18:09:56 +00:00
Chad Brubaker
f6c68ca61a Merge "Add the calling package name to requestRouteToHost" 2014-02-24 18:09:36 +00:00
Chad Brubaker
83ec7fcb2b Only allow System apps to make VPN exempt routes
requestRouteToHost will only allow system applications to make routes
exempt from the VPN's routing rules.

If a VPN is currently running and a non-system app requests a route it
will only succeed if that host is currently covered by a VPN exempt
routing rule. Otherwise it will fail.

For example, if a VPN is running and the MMS network is brought online
those routes will be added as VPN exempt. If an application then tries
to request a route to a MMS endpoint it will succeed because the routes
already exist. If an application tries to request a route to a host
covered by the VPN the call will fail.

Bug: 12937545
Change-Id: If7bcec91bbb96c62c8fb69748c975847e6c00b6f
2014-02-21 15:30:02 -08:00
JP Abgrall
d3bc570b7b ConnectivityService: add support to set TCP initial rwnd
The value for the TCP initial receive window comes from,
in order,

kernel
  /proc/sys/net/ipv4/tcp_default_init_rwnd

init.rc (via properties)
  net.tcp.default_init_rwnd

properties
  net.tcp.default_init_rwnd

gservices
  Settings.Global.TCP_DEFAULT_INIT_RWND

Bug: 12020135
Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
2014-02-21 12:05:20 -08:00
Patrick Tjin
870078d85a Modify unexpected mtu debug message to print mtu
Change-Id: Iacc78582c5e3d6b156e8e2eda25e89e0e5be6eda
2014-02-19 12:53:04 -08:00
Chad Brubaker
170386ea78 Add the calling package name to requestRouteToHost
The calling package name will be used to check if an application is a
system application when deciding if a route should be exempt from VPN
routing rules.

Bug: 12937545
Change-Id: I2c09c875fe9bb9685871a0a801ddcbb32fc17405
2014-02-19 11:04:49 -08:00
Chad Brubaker
e05e257bd0 Remove SO_BINDTODEVICE from VPN protect
SO_BINDTODEVICE is not needed with policy routing.
SO_BINDTODEVICE was also used on the default iface which causes problems
when the default iface is IPv6 only and the socket tries to connect to a
IPv4 address.

Bug: 12940882
Change-Id: I5b2bde0ac5459433fc5749f509072a548532f730
2014-02-13 18:19:43 -08:00
Dianne Hackborn
5da0d5a316 Start tracking radio up time.
We now always turn on network state tracking for mobile,
and push this information down to battery stats.

In battery stats we use this to both log the changes in
the history and keep track of the total time the mobile
radio was active.

Power computation is switched over to using this information
to help determine power use, which will hopefully make it
more accurate (not counting inaccuracies in knowing when it
actually goes down).

Note yet done is aggregating this data per-uid, to better
emphasize which apps are causing the radio to be up.  Right
now we just spread the total time across all uids weighted
by the total number of packets they have sent and received.

Also put in the battery stats infrastructure for bluetooth to
address issue #12973036: Improve power_profile.xml

Change-Id: I39d11b7ff6ae4f336f253d1cba308d8569de7e0d
2014-02-13 17:55:40 +00:00