Bill Yi
cf6566575d
am d9951c00: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD
...
* commit 'd9951c00d44532b2b90a1e0c94ccc708f7b032f5':
Update framework to use M33 Skia. DO NOT MERGE
2014-04-30 01:19:37 +00:00
Bill Yi
d9951c00d4
Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD
2014-04-29 16:07:29 -07:00
Elliott Hughes
e6ae3be829
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
8732b35f51
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
6d1b0b70af
Add support for custom TXT records in NSD
...
Change-Id: I8e6dc9852ad4d273c71ad6a63a7fbd28a206806d
2014-04-14 14:10:36 -07:00
Robert Greenwalt
f2bc515719
am e1d4847c: am eddae63a: am 9932c297: (-s ours) am f9e24b30: am b0f4f4d7: am 2cc9ee1c: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 7d574493: am 1600a26e: 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
00790e4f21
am c855a28a: am e630a073: am 4342c3d6: (-s ours) am 8f2cf6a9: 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 'c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:37:38 +00:00
Robert Greenwalt
eddae63ab2
am 9932c297: (-s ours) am f9e24b30: am b0f4f4d7: am 2cc9ee1c: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 7d574493: am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
...
* commit '9932c29766d5cea833f2b4cab2f72c782cead0b2':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:34:49 +00:00
Robert Greenwalt
9932c29766
am f9e24b30: am b0f4f4d7: am 2cc9ee1c: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 7d574493: am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
...
* commit 'f9e24b3065a0001ce826a101ce73eacac1aad743':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:27:50 +00:00
Robert Greenwalt
e630a07387
am 4342c3d6: (-s ours) am 8f2cf6a9: 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 '4342c3d6b2f745aec10c213a2107b877cf464f94':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:26:35 +00:00
Robert Greenwalt
f9e24b3065
am b0f4f4d7: am 2cc9ee1c: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 7d574493: am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs
...
* commit 'b0f4f4d76ac299bf313500288d26f07979e8c77e':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:21:52 +00:00
Robert Greenwalt
4342c3d6b2
am 8f2cf6a9: 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 '8f2cf6a980e629080e5ea196c1e7a07754abb3cf':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:18:41 +00:00
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
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
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
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
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
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
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
Chad Brubaker
41236f1dff
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
8f809883c7
am 89ba783f: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev
...
* commit '89ba783fdcfaf87a76682033b294325e461f95f4':
Only apply tcp buffer sizes for default net
2014-03-05 22:14:46 +00:00
Chad Brubaker
342cd4d214
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
edf0ac7298
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
89ba783fdc
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
eace8d5669
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
d9aebd5551
am 86321b8c: am cf73f46a: am ba71f589: am 7261e86e: (-s ours) am 4aadb99c: am 2d3f03d7: DO NOT MERGE Sanitize WifiConfigs
...
* commit '86321b8ce61f8f07191041c079e88a9dc610aa38':
DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:25:11 +00:00
Robert Greenwalt
86321b8ce6
am cf73f46a: am ba71f589: am 7261e86e: (-s ours) am 4aadb99c: am 2d3f03d7: DO NOT MERGE Sanitize WifiConfigs
...
* commit 'cf73f46a514f5c2b1a0de137ed203401417307b4':
DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:21:50 +00:00
Robert Greenwalt
ba71f589fb
am 7261e86e: (-s ours) am 4aadb99c: am 2d3f03d7: DO NOT MERGE Sanitize WifiConfigs
...
* commit '7261e86ef6464005603a48ab9289f7516a7ea3d4':
DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:14:26 +00:00