Commit Graph

1175 Commits

Author SHA1 Message Date
Elliott Hughes
82f8bca44c am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
2014-04-28 18:36:53 +00:00
Elliott Hughes
7ab8162420 Track libcore.os' move to android.system.
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
2014-04-28 11:11:32 -07:00
Christopher Lane
2ac2ff8f74 Add support for custom TXT records in NSD
Change-Id: I8e6dc9852ad4d273c71ad6a63a7fbd28a206806d
2014-04-14 14:10:36 -07:00
Robert Greenwalt
7482d1f523 am e1d4847c: am e359c567: am 48ee02c9: (-s ours) 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 'e1d4847c120f4ab72b3acfed17c0015bdb2befaf':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:46:58 +00:00
Robert Greenwalt
d4f3279c68 am c855a28a: am 9b2dc4a4: 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 'c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:37:38 +00:00
Robert Greenwalt
e359c56733 am 48ee02c9: (-s ours) 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 '48ee02c908b6e03d24eb7f42398afacf01454c4a':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:34:49 +00:00
Robert Greenwalt
48ee02c908 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 '8af2d559d16c73c66107c67fbf382fcb6220435d':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:27:50 +00:00
Robert Greenwalt
9b2dc4a4f8 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 '8720396ab29326396cbdc80c1e6636de11ee5527':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:26:35 +00:00
Robert Greenwalt
8af2d559d1 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 '703fc413d2f70fc53bc4c42593a7b46f79def897':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:21:52 +00:00
Robert Greenwalt
8720396ab2 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 'd3e9af7eb4b7463ee42492ed104c20170f2fbdef':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:18:41 +00:00
Robert Greenwalt
703fc413d2 am c0274fbe: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit 'c0274fbe7c99017c2631728d7370a54591acda44':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:16:15 +00:00
Robert Greenwalt
d3e9af7eb4 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 '1ab38f65294146e85700f5dfdd549e5f28a6b4aa':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:12:56 +00:00
Robert Greenwalt
c0274fbe7c 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
2014-04-07 20:09:33 +00:00
Robert Greenwalt
1ab38f6529 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 '7ad36cd3c3d08b9e1ddc56ff1c201a5a3f7ddde2':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:07:10 +00:00
Robert Greenwalt
7ad36cd3c3 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
2014-04-07 20:00:33 +00:00
Robert Greenwalt
3f829bc362 am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
* commit 'f8c2a0254404d29ad3c0dad4aba55b3bc1204abf':
  DO NOT MERGE Sanitize WifiConfigs
2014-04-07 19:47:49 +00:00
Robert Greenwalt
f8c2a02544 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
d4df40321c 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
Robert Greenwalt
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: 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
Chad Brubaker
0b397ad924 am 1fce89d9: am 38dc9b4e: 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
38dc9b4e9a Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 2014-03-21 20:52:05 +00:00
Robert Greenwalt
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.
2014-03-19 19:08:44 +00:00
Robert Greenwalt
cb58a2fc42 Merge "Handle provisioning APN by turning off/on data." into klp-dev 2014-03-19 16:12:01 +00:00
Wink Saville
22163fbd49 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
6404b926af 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
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
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
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
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
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
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
Hui Lu
07f2933a07 Add proxy as another network.
Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb
2014-01-30 17:26:18 -05:00
Amith Yamasani
6ac202be31 Move some system services to separate directories
Refactored the directory structure so that services can be optionally
excluded. This is step 1. Will be followed by another change that makes
it possible to remove services from the build.

Change-Id: Ideacedfd34b5e213217ad3ff4ebb21c4a8e73f85
2013-12-19 15:25:37 -08:00
Lorenzo Colitti
a58711d5b5 am b4ccc540: Merge "Add address flags and scope to LinkAddress."
* commit 'b4ccc5407932858e9e4cdc29dafe05e810e35f22':
  Add address flags and scope to LinkAddress.
2013-12-09 10:28:19 -08:00
Lorenzo Colitti
b4ccc54079 Merge "Add address flags and scope to LinkAddress." 2013-12-07 02:43:04 +00:00
Lorenzo Colitti
4ea70b7743 Add address flags and scope to LinkAddress.
This is necessary so that the framework can know whether an IPv6
address is likely to be usable (i.e., if it's global scope and
preferred). Also, it will simplify the address notification
methods in INetworkManagementEventObserver, which currently take
the address, the flags, and the scope as separate arguments.

1. Add flags and scope to the class and update the unit test.
   Use the IFA_F_* and RT_SCOPE_* constants defined by libcore.
   Since most callers don't know about flags and scope, provide
   constructors that default the flags to zero and determine the
   scope from the address. Addresses notified by the kernel will
   have these properly set. Make multicast addresses invalid.
   Update the class documentation.
2. Provide an isSameAddressAs() method that compares only the
   address and prefix information between two LinkAddress
   objects. This is necessary because an interface can't have
   two addresses with the same address/prefix but different
   flags.
3. Update LinkProperties's addLinkAddress and removeLinkAddress
   to identify existing addresses to add/remove using
   isSameAddressAs instead of implicit equals(). Specifically:
   - If addLinkAddress is called with an address that is already
     present, the existing address's flags and scope are updated.
     This allows, for example, an address on an interface to go
     from preferred to deprecated when it expires, without it
     having to be removed and re-added.
   - If removeLinkAddress is called with an address that is
     present but with different flags, it deletes that address
     instead of failing to find a match.
4. Update the INetworkManagementEventObserver address
   notification methods to take just a LinkAddress instead of
   LinkAddress, flags, and scope. While I'm at it, change the
   order of the arguments for consistency with the other
   functions in the interface.

Change-Id: Id8fe0f09a7e8f6bee1ea3b52102178b689a9336e
2013-12-06 13:54:35 +09:00