Robert Greenwalt
b0f4f4d76a
am 2cc9ee1c: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 7d574493: am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
...
* commit '2cc9ee1c6fd302ef34045f8f2c8f812222ce7807':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:16:15 +00:00
Robert Greenwalt
8f2cf6a980
am 39e9ece0: am b3efa6a3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 8a1be0be: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
...
* commit '39e9ece04502e57f30e6814a01e6673d2a4216a5':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:12:56 +00:00
Robert Greenwalt
2cc9ee1c6f
am 2c90609c: am 339cfdbd: am 72f9b308: am 7d574493: am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
...
* commit '2c90609c0bddb6fbe255e5632a1e6639e760290f':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:09:33 +00:00
Robert Greenwalt
39e9ece045
am b3efa6a3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 8a1be0be: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
...
* commit 'b3efa6a38bbc5109db605ec62ebffa820ba402ce':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:07:10 +00:00
Robert Greenwalt
b3efa6a38b
am 106627e0: am e42ce676: am ebf23a8d: am 8a1be0be: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
...
* commit '106627e07cecfa8a9bcc43578fde78652fc59eba':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:00:33 +00:00
Robert Greenwalt
7d57449337
am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
...
* commit '1600a26e64e8ade9a67418ca1792c6100a99d15f':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 19:47:49 +00:00
Robert Greenwalt
1600a26e64
am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
...
* commit '7f6d1ef7d85327c80f9539cc17895fe61cba2016':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 19:42:49 +00:00
Robert Greenwalt
7f6d1ef7d8
am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
...
* commit '8eac056f75f09ecdbc2fe550b6e05c8d6fd30398':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 19:36:54 +00:00
Robert Greenwalt
8a1be0be1f
am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
...
* commit '3c417fbf21133340cbbe3539d87c453f81ae3a9d':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 19:36:44 +00:00
The Android Automerger
1c6abef365
merge in master-release history after reset to master
2014-04-07 05:49:39 -07:00
Jaewan Kim
6964e76e2d
Merge "Revert "Refactor IpConfiguration from WifiConfiguration""
2014-04-07 09:01:43 +00:00
Jaewan Kim
273c161b68
Revert "Refactor IpConfiguration from WifiConfiguration"
...
This reverts commit e51d2c5ade .
Change-Id: Ibccea84e5dc44c1b8954779660e0721b27f762d4
2014-04-07 09:01:24 +00:00
Jaewan Kim
6a9403215a
Revert "Hide IpConfiguration"
...
This reverts commit 3b81925ae8 .
Change-Id: I5728114dbd9ef37509e8ab3c942648ec92ef0c1a
2014-04-07 08:54:45 +00:00
Jaewan Kim
3b81925ae8
Hide IpConfiguration
...
Bug: 7606609, Bug: 8687763
Change-Id: I2970bf79ef14cb993878c1dc10c7022a716f46c5
2014-04-07 17:11:39 +09:00
Jaewan Kim
e51d2c5ade
Refactor IpConfiguration from WifiConfiguration
...
Bug: 7606609, Bug: 8687763
Change-Id: I736eb3c73a8ffc8f137a04a5ea66ee564dc2b530
2014-04-07 11:35:35 +09:00
Robert Greenwalt
d4f7652c27
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: I80912cc08ffa1e4b63008c94630006cf316e7a64
2014-03-28 14:54:53 -07:00
Robert Greenwalt
8eac056f75
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: I98c0672a6d9c8d5bc4f160849aa0fa182073216b
2014-03-28 11:38:33 -07:00
The Android Automerger
57cf9c40ad
merge in master-release history after reset to master
2014-03-25 05:50:07 -07:00
Chad Brubaker
f950f05e21
am 7f623d6b: am 9506e84b: am ba1a9a61: am 1fce89d9: am e6d1fa7a: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
...
* commit '7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8':
Include the interface for clearDnsInterfaceForUidRange
2014-03-24 19:35:20 +00:00
Chad Brubaker
fa25ba834a
am 1fce89d9: am e6d1fa7a: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
...
* commit '1fce89d946760a1bcf3a733f55494f963eab00c2':
Include the interface for clearDnsInterfaceForUidRange
2014-03-21 23:09:21 +00:00
Chad Brubaker
ba1a9a6132
am 1fce89d9: am e6d1fa7a: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
...
* commit '1fce89d946760a1bcf3a733f55494f963eab00c2':
Include the interface for clearDnsInterfaceForUidRange
2014-03-21 21:02:43 +00:00
Chad Brubaker
e6d1fa7aeb
Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
2014-03-21 20:52:05 +00:00
The Android Automerger
67b504ab2f
merge in master-release history after reset to master
2014-03-20 05:50:29 -07:00
Robert Greenwalt
5fad0b3ae5
Catch Netd exceptions to avoid runtime restart
...
bug:13475636
Change-Id: If36a0051a957fc066711fe8225f8981bc07add04
2014-03-19 15:17:03 -07:00
Etan Cohen
0485d1f83d
Merge "Catch Netd exceptions to avoid runtime restart"
2014-03-19 21:30:15 +00:00
Robert Greenwalt
cdb8463420
Catch Netd exceptions to avoid runtime restart
...
bug:13475636
Change-Id: If36a0051a957fc066711fe8225f8981bc07add04
2014-03-19 14:26:28 -07:00
Robert Greenwalt
f8361db359
resolved conflicts for merge of 0bff77d6 to master
...
Change-Id: Ia4c86126079740978658a05579b56d59d41a7b01
2014-03-19 12:41:54 -07:00
Robert Greenwalt
98bb98bdd0
am bd84f01c: am 22e0dfc4: Merge "Handle provisioning APN by turning off/on data." into klp-dev
...
* commit 'bd84f01c6ce122ab58fc7c5b687dc8bfb0fb03e6':
Handle provisioning APN by turning off/on data.
2014-03-19 19:08:44 +00:00
Robert Greenwalt
f0439c7c1e
am bd84f01c: am 22e0dfc4: Merge "Handle provisioning APN by turning off/on data." into klp-dev
...
* commit 'bd84f01c6ce122ab58fc7c5b687dc8bfb0fb03e6':
Handle provisioning APN by turning off/on data.
2014-03-19 16:20:20 +00:00
Robert Greenwalt
22e0dfc465
Merge "Handle provisioning APN by turning off/on data." into klp-dev
2014-03-19 16:12:01 +00:00
The Android Automerger
75f95c6510
merge in master-release history after reset to master
2014-03-19 05:50:08 -07:00
Ashish Sharma
40298930a2
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
29f7e0e8ca
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
Wink Saville
98fee2c93b
Handle provisioning APN by turning off/on data.
...
This is a start and two tests succeed:
Tested expired AT&T SIM and waiting 15min for alarm to fire.
Tested a provisioned Verizon SIM and works normally.
I've NOT tested AT&T where I've properly completed the provisioning.
I've NOT tested T-Mobile SIM either provisioned or not-provisioned.
I've NOT tested provisioning over WiFi.
I've NOT tested that WiFi <-> Mobile works
I've NOT tested voice calls, SMS, MMS
...
The current bug is below, but it is poorly named either it should be
renamed or a new bug created.
Bug: 13190133
Change-Id: I0a09f642614cd27a8655e9dae764b8999ce485b8
2014-03-18 10:58:40 -07:00
Chad Brubaker
11ca0a104d
Include the interface for clearDnsInterfaceForUidRange
...
With netd allowing overlapping rules for uid range rules the interface
name is needed to make sure only the correct rule is removed.
Bug: 12134439
Change-Id: I94f77f154f49ca8d5f6cf49683a4473cc92c3eb7
2014-03-15 15:31:47 -07:00
The Android Automerger
5cfe4fb818
merge in master-release history after reset to master
2014-03-15 05:51:14 -07:00
JP Abgrall
141b1afb02
am d47dc7c3: am 7238585e: am 36b41e20: am 4ecd833e: am 1a1703f9: 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
a90c9b5476
am ff9da494: am 4b59883a: am 7e3104d4: 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
36b41e20e0
am 4ecd833e: am 1a1703f9: 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
7e3104d46d
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
a47785b917
am 0b925975: (-s ours) am 48dd8b0f: am 51e6a21f: 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
693e8300c5
am 6467e900: (-s ours) am 7f68f7f4: am 7226f998: 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
d25b11b4a0
am 4ecd833e: am 1a1703f9: 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 04:12:54 +00:00
Chad Brubaker
74fdb72dd5
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 04:12:46 +00:00
JP Abgrall
1a1703f929
Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
2014-03-13 20:33:44 +00:00
Chad Brubaker
51e6a21fc0
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
7226f99898
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
af3781c983
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
097a3491a7
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-12 23:21:05 +00:00
Chad Brubaker
55b1ef9128
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-12 23:21:02 +00:00