Commit graph

13,045 commits

Message SHA1
am 8af2d559: am 703fc413: am c0274fbe: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit '8af2d559d1':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:27:50 +00:00
48ee02c908
am 8720396a: (-s ours) am d3e9af7e: am 1ab38f65: am 7ad36cd3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am d4df4032: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '8720396ab2':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:26:35 +00:00
9b2dc4a4f8
am 703fc413: am c0274fbe: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit '703fc413d2':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:21:52 +00:00
8af2d559d1
am d3e9af7e: am 1ab38f65: am 7ad36cd3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am d4df4032: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit 'd3e9af7eb4':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:18:41 +00:00
8720396ab2
am c0274fbe: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit 'c0274fbe7c':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:16:15 +00:00
703fc413d2
am 1ab38f65: am 7ad36cd3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am d4df4032: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '1ab38f6529':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:12:56 +00:00
d3e9af7eb4
am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit '2c90609c0bddb6fbe255e5632a1e6639e760290f':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:09:33 +00:00
c0274fbe7c
am 7ad36cd3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am d4df4032: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '7ad36cd3c3':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:07:10 +00:00
1ab38f6529
am 106627e0: am e42ce676: am ebf23a8d: am d4df4032: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '106627e07cecfa8a9bcc43578fde78652fc59eba':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 20:00:33 +00:00
7ad36cd3c3
am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit 'f8c2a02544':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 19:47:49 +00:00
3f829bc362
am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit '7f6d1ef7d8':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 19:42:49 +00:00
f8c2a02544
am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit '8eac056f75':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 19:36:54 +00:00
7f6d1ef7d8
am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '3c417fbf21133340cbbe3539d87c453f81ae3a9d':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-04-07 19:36:44 +00:00
d4df40321c
merge in master-release history after reset to master
The Android Automerger   commited 2014-04-07 05:49:39 -07:00
ec070e4431
Merge "Revert "Refactor IpConfiguration from WifiConfiguration""
Jaewan Kim   authored and   Android (Google) Code Review   commited 2014-04-07 09:01:43 +00:00
120a0a7281
Revert "Refactor IpConfiguration from WifiConfiguration"
This reverts commit 9472a8b7bc.

Change-Id: Ibccea84e5dc44c1b8954779660e0721b27f762d4

Jaewan Kim   commited 2014-04-07 09:01:24 +00:00
4b3419625d
Revert "Hide IpConfiguration"
This reverts commit 9532c528bf.

Change-Id: I5728114dbd9ef37509e8ab3c942648ec92ef0c1a

Jaewan Kim   commited 2014-04-07 08:54:45 +00:00
7852c32e32
Hide IpConfiguration
Bug: 7606609, Bug: 8687763
Change-Id: I2970bf79ef14cb993878c1dc10c7022a716f46c5

Jaewan Kim   commited 2014-04-07 17:11:39 +09:00
9532c528bf
Refactor IpConfiguration from WifiConfiguration
Bug: 7606609, Bug: 8687763
Change-Id: I736eb3c73a8ffc8f137a04a5ea66ee564dc2b530

Jaewan Kim   commited 2014-04-07 11:35:35 +09:00
9472a8b7bc
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

Robert Greenwalt   commited 2014-03-28 14:54:53 -07:00
705447776c
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

Robert Greenwalt   commited 2014-03-28 11:38:33 -07:00
8eac056f75
merge in master-release history after reset to master
The Android Automerger   commited 2014-03-25 05:50:07 -07:00
e2863bd8c8
am 7f623d6b: am 9506e84b: am 0b397ad9: am 1fce89d9: am 38dc9b4e: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8':
  Include the interface for clearDnsInterfaceForUidRange

Chad Brubaker   authored and   Android Git Automerger   commited 2014-03-24 19:35:20 +00:00
92975d62fe
am 1fce89d9: am 38dc9b4e: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '1fce89d946760a1bcf3a733f55494f963eab00c2':
  Include the interface for clearDnsInterfaceForUidRange

Chad Brubaker   authored and   Android Git Automerger   commited 2014-03-21 23:09:21 +00:00
a5bbba8109
am 1fce89d9: am 38dc9b4e: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '1fce89d946760a1bcf3a733f55494f963eab00c2':
  Include the interface for clearDnsInterfaceForUidRange

Chad Brubaker   authored and   Android Git Automerger   commited 2014-03-21 21:02:43 +00:00
0b397ad924
Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
Chad Brubaker   authored and   Android (Google) Code Review   commited 2014-03-21 20:52:05 +00:00
38dc9b4e9a
merge in master-release history after reset to master
The Android Automerger   commited 2014-03-20 05:50:29 -07:00
7b86a6cdbf
Catch Netd exceptions to avoid runtime restart
bug:13475636
Change-Id: If36a0051a957fc066711fe8225f8981bc07add04

Robert Greenwalt   authored and   The Android Automerger   commited 2014-03-19 15:17:03 -07:00
162efe9964
Merge "Catch Netd exceptions to avoid runtime restart"
Etan Cohen   authored and   Android (Google) Code Review   commited 2014-03-19 21:30:15 +00:00
1f025e18eb
Catch Netd exceptions to avoid runtime restart
bug:13475636
Change-Id: If36a0051a957fc066711fe8225f8981bc07add04

Robert Greenwalt   commited 2014-03-19 14:26:28 -07:00
37bf0ed5af
resolved conflicts for merge of 0bff77d6 to master
Change-Id: Ia4c86126079740978658a05579b56d59d41a7b01

Robert Greenwalt   commited 2014-03-19 12:41:54 -07:00
83a6089fba
am bd84f01c: am cb58a2fc: Merge "Handle provisioning APN by turning off/on data." into klp-dev
* commit 'bd84f01c6ce122ab58fc7c5b687dc8bfb0fb03e6':
  Handle provisioning APN by turning off/on data.

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-03-19 19:08:44 +00:00
2bc1361cee
am bd84f01c: am cb58a2fc: Merge "Handle provisioning APN by turning off/on data." into klp-dev
* commit 'bd84f01c6ce122ab58fc7c5b687dc8bfb0fb03e6':
  Handle provisioning APN by turning off/on data.

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-03-19 16:20:20 +00:00
3a50014de0
Merge "Handle provisioning APN by turning off/on data." into klp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-03-19 16:12:01 +00:00
cb58a2fc42
merge in master-release history after reset to master
The Android Automerger   commited 2014-03-19 05:50:08 -07:00
796d1a3890
Update the tests to deal with the new timestamps in idletimer module.
Change-Id: I1a8368d84ef806f1501b0a1f5e817388a1d10518

Ashish Sharma   commited 2014-03-18 16:38:58 -07:00
5a07255d7e
Include elapsed realtime (nanos) of the event in the radio state change notifications.
Bug: 13247811
Change-Id: I3454aa159a68b9087b4762df947b41965b5a3941

Ashish Sharma   commited 2014-03-18 21:42:02 +00:00
601fba91e3
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

Wink Saville   authored and   Robert Greenwalt   commited 2014-03-18 10:58:40 -07:00
22163fbd49
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

Chad Brubaker   commited 2014-03-15 15:31:47 -07:00
6404b926af
merge in master-release history after reset to master
The Android Automerger   commited 2014-03-15 05:51:14 -07:00
7e1e7ac3a1
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

JP Abgrall   authored and   Android Git Automerger   commited 2014-03-14 17:53:49 +00:00
22b42d6a84
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

Chad Brubaker   authored and   Android Git Automerger   commited 2014-03-14 17:53:45 +00:00
c0fbb3eb6e
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

JP Abgrall   authored and   Android Git Automerger   commited 2014-03-14 16:28:09 +00:00
f118689ceb
am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
  Remove SO_BINDTODEVICE from VPN protect

Chad Brubaker   authored and   Android Git Automerger   commited 2014-03-14 16:27:58 +00:00
5013be94c8
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

Chad Brubaker   authored and   Android Git Automerger   commited 2014-03-14 10:34:30 +00:00
e721c5e3a8
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

Chad Brubaker   authored and   Android Git Automerger   commited 2014-03-14 10:28:28 +00:00
b9982a2f77
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

JP Abgrall   authored and   Android Git Automerger   commited 2014-03-14 04:12:54 +00:00
cdd54e3f31
am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
  Remove SO_BINDTODEVICE from VPN protect

Chad Brubaker   authored and   Android Git Automerger   commited 2014-03-14 04:12:46 +00:00
bea50e2d4e
Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
JP Abgrall   authored and   Android (Google) Code Review   commited 2014-03-13 20:33:44 +00:00
6f3e6dd0a2
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

Chad Brubaker   authored and   Android Git Automerger   commited 2014-03-13 18:18:40 +00:00
11a1d123e0