Jason Monk
18d0621adf
Merge "Make proxy API public"
2014-05-07 18:54:12 +00:00
Jason Monk
1e3df5d297
Make proxy API public
...
Also exposed proxy-related functions that were on the
ConnectivityManager.
Change-Id: I9fb5f1bcc257a6198679ea1d56e18da2ec5a3b33
2014-05-07 14:23:53 -04:00
Bill Yi
7a7a5b5518
am 96614925: am 582d33aa: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD
...
* commit '966149258c0a95f390a82ada4ac95314071ff568':
Update framework to use M33 Skia. DO NOT MERGE
2014-04-30 12:51:01 +00:00
Bill Yi
966149258c
am 582d33aa: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD
...
* commit '582d33aa843a741374b097ac582e31075f2decd8':
Update framework to use M33 Skia. DO NOT MERGE
2014-04-30 01:19:37 +00:00
Bill Yi
582d33aa84
Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD
2014-04-29 16:07:29 -07:00
Elliott Hughes
3080c001b5
resolved conflicts for merge of 82f8bca4 to master
...
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
2014-04-28 13:53:25 -07:00
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
70cafe1b52
resolved conflicts for merge of 381ac080 to master
...
Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21
2014-04-14 15:14:01 -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
add1fb69e0
am 4455c599: (-s ours) am 7482d1f5: 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 '4455c5999f72daaf6f15c4394e413976f14337d3':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:59:05 +00:00
Robert Greenwalt
574d7a0c98
am f00b906f: (-s ours) am d4f3279c: 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 'f00b906f01319a8177d2e2ab109ff01016b0bf4c':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 20:50:46 +00: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
Jaewan Kim
120a0a7281
Merge "Revert "Refactor IpConfiguration from WifiConfiguration""
2014-04-07 09:01:43 +00:00
Jaewan Kim
4b3419625d
Revert "Refactor IpConfiguration from WifiConfiguration"
...
This reverts commit 9472a8b7bc
2014-04-07 09:01:24 +00:00
Jaewan Kim
7852c32e32
Revert "Hide IpConfiguration"
...
This reverts commit 9532c528bf
2014-04-07 08:54:45 +00:00
Jaewan Kim
9532c528bf
Hide IpConfiguration
...
Bug: 7606609, Bug: 8687763
Change-Id: I2970bf79ef14cb993878c1dc10c7022a716f46c5
2014-04-07 17:11:39 +09:00
Jaewan Kim
9472a8b7bc
Refactor IpConfiguration from WifiConfiguration
...
Bug: 7606609, Bug: 8687763
Change-Id: I736eb3c73a8ffc8f137a04a5ea66ee564dc2b530
2014-04-07 11:35:35 +09: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
92975d62fe
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
2014-03-24 19:35:20 +00:00
Chad Brubaker
a5bbba8109
am 1fce89d9: am 38dc9b4e: 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
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
Etan Cohen
1f025e18eb
Merge "Catch Netd exceptions to avoid runtime restart"
2014-03-19 21:30:15 +00:00
Robert Greenwalt
37bf0ed5af
Catch Netd exceptions to avoid runtime restart
...
bug:13475636
Change-Id: If36a0051a957fc066711fe8225f8981bc07add04
2014-03-19 14:26:28 -07:00
Robert Greenwalt
83a6089fba
resolved conflicts for merge of 0bff77d6 to master
...
Change-Id: Ia4c86126079740978658a05579b56d59d41a7b01
2014-03-19 12:41:54 -07: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
3a50014de0
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 16:20:20 +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
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
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
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
