Commit Graph

5569 Commits

Author SHA1 Message Date
Etan Cohen
ccc22fd221 [automerger skipped] Merge "Add IPv6 link-local address generation from EUI-48" am: fb0dcb1ed7 am: e6db899061
am: 79e553dea6  -s ours

Change-Id: I3121a9d36008857cb244ecbd4fc579cb4ac6e33c
2018-11-19 16:59:40 -08:00
Etan Cohen
79e553dea6 Merge "Add IPv6 link-local address generation from EUI-48" am: fb0dcb1ed7
am: e6db899061

Change-Id: I63de4fa185649d9389a771860c479899e90b37e4
2018-11-19 16:48:22 -08:00
Etan Cohen
e6db899061 Merge "Add IPv6 link-local address generation from EUI-48"
am: fb0dcb1ed7

Change-Id: I463cc804b21c99512e506b60a44cd62732d3c2b2
2018-11-19 16:38:06 -08:00
Etan Cohen
fb0dcb1ed7 Merge "Add IPv6 link-local address generation from EUI-48" 2018-11-20 00:19:54 +00:00
Remi NGUYEN VAN
73249667df Merge "(Really) fix LingerMonitor rate limiting" am: cf33708bcd am: e668ae16bc
am: 4c1318c162

Change-Id: I880d7d28b4c13fd05d1f1541af58d7db60c5c9c3
2018-11-18 23:49:52 -08:00
Remi NGUYEN VAN
4c1318c162 Merge "(Really) fix LingerMonitor rate limiting" am: cf33708bcd
am: e668ae16bc

Change-Id: I55d69d0bf1102b4159db5ffb4a37684f7a676008
2018-11-18 23:40:38 -08:00
Remi NGUYEN VAN
e668ae16bc Merge "(Really) fix LingerMonitor rate limiting"
am: cf33708bcd

Change-Id: I3b03f5985137a57e7c3ed3b2e0030078a4ea676d
2018-11-18 23:26:25 -08:00
Treehugger Robot
cf33708bcd Merge "(Really) fix LingerMonitor rate limiting" 2018-11-19 07:14:11 +00:00
Etan Cohen
ec1c466cb0 Add IPv6 link-local address generation from EUI-48
Add a utility method to convert an EUI-48 to an IPv6 link-local
address based on RFC 4291 (EUI-64 generation) followed by RFC 4862.

Bug: 117605977
Test: atest MacAddressTest
Merged-In: I80b683e69da6beff3b37fc345fc15aa9610d09b7
Change-Id: I80b683e69da6beff3b37fc345fc15aa9610d09b7
2018-11-16 21:50:24 -08:00
Etan Cohen
42ab31a798 Add IPv6 link-local address generation from EUI-48
Add a utility method to convert an EUI-48 to an IPv6 link-local
address based on RFC 4291 (EUI-64 generation) followed by RFC 4862.

Bug: 117605977
Test: atest MacAddressTest
Change-Id: I80b683e69da6beff3b37fc345fc15aa9610d09b7
2018-11-16 14:00:22 -08:00
Lorenzo Colitti
02f4b2fe28 [automerger skipped] Merge changes from topic "sort stats" into pi-dev am: 664145dcbc -s ours
am: 0813f8c4ea  -s ours

Change-Id: Ifb8171b56932ef6b7c70a0ff36ebacc4ee7801db
2018-11-16 05:56:23 -08:00
Lorenzo Colitti
0813f8c4ea [automerger skipped] Merge changes from topic "sort stats" into pi-dev
am: 664145dcbc  -s ours

Change-Id: Iaf2d41bf8c4464e05f8733d453fcc1a168ef8323
2018-11-16 05:41:50 -08:00
Remi NGUYEN VAN
2fd1499f6a (Really) fix LingerMonitor rate limiting
The previous patch was applied to the wrong member and did not actually
fix the issue.

Bug: b/117516272
Test: remote run passed
Change-Id: I3f9c27ebd6c339e98a71cb179b0be65950f9b864
2018-11-16 14:53:14 +09:00
Remi NGUYEN VAN
49f792a689 Merge "Fix LingerMonitor notification rate limiting" am: 822d2b5991 am: 65cf30800c
am: eb7dedc3b8

Change-Id: I1cdc817a27b7e966837d9c56f7e93b8bc917c6c0
2018-11-13 02:12:51 -08:00
Remi NGUYEN VAN
eb7dedc3b8 Merge "Fix LingerMonitor notification rate limiting" am: 822d2b5991
am: 65cf30800c

Change-Id: I17b180a7dc2d06c54d4a6282414b818b83ecdfdc
2018-11-13 01:59:56 -08:00
Remi NGUYEN VAN
65cf30800c Merge "Fix LingerMonitor notification rate limiting"
am: 822d2b5991

Change-Id: I68800c06e8d4413b2e46176a12dc60b436277653
2018-11-13 01:46:21 -08:00
Treehugger Robot
822d2b5991 Merge "Fix LingerMonitor notification rate limiting" 2018-11-13 09:36:39 +00:00
Junyu Lai
7ce46d8ec9 Merge "Use spy in PermissionMonitorTest." am: e666ae6ee5 am: 57b23ac131
am: d783fb242b

Change-Id: I1478b9c2bb12b6bfd161be99c5faa7aec76d9a7f
2018-11-09 14:16:41 -08:00
Junyu Lai
d783fb242b Merge "Use spy in PermissionMonitorTest." am: e666ae6ee5
am: 57b23ac131

Change-Id: I9eac5d82c0b5e3eb5593407aa2eb82cb8c71dc2e
2018-11-09 01:11:47 -08:00
Junyu Lai
57b23ac131 Merge "Use spy in PermissionMonitorTest."
am: e666ae6ee5

Change-Id: I6074b6fb2f90821ddad93db18fbb633225b4292f
2018-11-09 01:01:25 -08:00
Junyu Lai
e666ae6ee5 Merge "Use spy in PermissionMonitorTest." 2018-11-09 08:47:03 +00:00
junyulai
4ae90ee86e Use spy in PermissionMonitorTest.
Bug: 118811303
Test: runtest frameworks-net
Change-Id: Id61a9efecf1d1ed5a9045b78ecfec9239e13967b
2018-11-09 12:37:16 +08:00
soma, kawata
a2bd7b1c40 Merge "Add skip464xlat test in Nat464XlatTest" am: aef8fe0d47 am: 0ecbb97b4a
am: f7ada22224

Change-Id: I9d59f05ee0d73c5df8351de1332ee0a5924ae8e8
2018-11-08 05:26:30 -08:00
soma, kawata
f7ada22224 Merge "Add skip464xlat test in Nat464XlatTest" am: aef8fe0d47
am: 0ecbb97b4a

Change-Id: Iee577b9b65ca9b576da966d6ca2468da9aa749ef
2018-11-08 05:10:10 -08:00
soma, kawata
0ecbb97b4a Merge "Add skip464xlat test in Nat464XlatTest"
am: aef8fe0d47

Change-Id: If437d8eadbc81655756b9b7cac1a5cda019a45da
2018-11-08 05:00:10 -08:00
junyulai
e43ff3e85f Fix negative uid stats caused by 464xlat adjust when eBPF is on.
When using xt_qtaguid to count per uid stats,
NetworkStatsService needs to adjust the 464xlat traffic since
iptables module would double count for ipv4 and ipv6 packet.
But for eBPF, the per uid stats is collected in a different
hook, so the adjustment on root uid would only be needed in tx
direction.

Bug: 112226716
Test: 1. Make ipv4 traffic in ipv6-only network and check data
         usage.
      2. Make ipv4 traffic in a client which connect to
         ipv6-only hotspot.
      3. runtest frameworks-net
      4. cts-tradefed run cts -m CtsNetTestCases -t \
                 android.net.cts.TrafficStatsTest
      5. cts-tradefed run cts -m CtsUsageStatsTestCases

Change-Id: Ic9a84f5446eddc943c255d5f3b89dad171f53cac
Merged-In: Ic9a84f5446eddc943c255d5f3b89dad171f53cac
(cherry picked from commit c33ac0d43b594f6154accf03ae7e3fd34dedc79d)
2018-11-07 10:16:26 +08:00
Roshan Pius
27b2f48f66 Merge changes from topic "network_request_match_callback"
* changes:
  WifiManager: Network request match callback registration
  wifi(API): NetworkSpecifier for Wifi NetworkAgent
  wifi(API): Mark old API's deprecated
  wifi(API): New API surface for network suggestion
  wifi(API): New API surface for connection via NetworkRequest
2018-11-06 17:42:58 +00:00
soma, kawata
4d041d5caa Add skip464xlat test in Nat464XlatTest
Bug: 69949375
Test: Nat464XlatTest, ConnectivityServiceTest

Change-Id: Ibc66d9c2dc8e3d1f118e5f6940e7b3fd4646efd1
2018-11-06 06:02:50 +00:00
Remi NGUYEN VAN
1dd54da1f6 Fix LingerMonitor notification rate limiting
If time since boot is lower than the rate limit, notifications would not
be shown.
This is causing tests to fail on continuous testing.

Test: atest FrameworksNetTests
Bug: b/117516272
Change-Id: I03da28f2ca61119fa0ef9534bb4ce3f6406c1ff2
2018-11-02 17:26:37 +09:00
Paul Hu
ade0ea01c9 Merge "Support backward compatibility for restricted network permission" am: 3e8de1cade am: 5d443532b6
am: f30eb2c1ee

Change-Id: Icdf485f714e05fa8500ea785230444fbeac98cc5
2018-11-01 01:13:32 -07:00
Paul Hu
f30eb2c1ee Merge "Support backward compatibility for restricted network permission" am: 3e8de1cade
am: 5d443532b6

Change-Id: I9b2faf60ff007e2cc08dacd6988fe98377468e7e
2018-11-01 00:46:15 -07:00
Paul Hu
5d443532b6 Merge "Support backward compatibility for restricted network permission"
am: 3e8de1cade

Change-Id: I15ef9c6efd40e8fe9bb9ff6ae98cae556dc0f8fd
2018-11-01 00:33:39 -07:00
Paul Hu
3e8de1cade Merge "Support backward compatibility for restricted network permission" 2018-11-01 07:20:05 +00:00
paulhu
8e38c05bb3 Support backward compatibility for restricted network permission
Some native daemons legacy design work with SYSTEM_UID. If none of
SYSTEM_UID apps declare the restricted network permission, it will
result in permission denial in daemons. Allow SYSTEM_UID in the
devices shipped before Q to support backward compatibility.

Bug:114245686
Test: 1. runtest frameworks-net
      2. atest FrameworksNetTests
      3. Native daemons with SYSTEM_UID can work normally

Change-Id: I6f3f0d83bcae74ef5389535b528af3baf649fa48
2018-11-01 10:38:11 +08:00
Roshan Pius
e26dae35e7 wifi(API): NetworkSpecifier for Wifi NetworkAgent
Create an @hide NetworkSpecifier to use by the Wifi NetworkAgent. This
will be used by connectivity service to match the incoming
NetworkRequest (with WifiNetworkSpecifier) with the NetworkAgent we
created to serve that request.
The WifiNetworkAgentSpecifier will hold the current connected wifi
network configuration which will be used to pattern match the
WifiNetworkSpecifier from NetworkRequest's.

Also, added a @hide helper method in MacAddress to help with matching
bssid pattern.

Bug: 113878056
Test: Unit tests
Change-Id: I9a643f0b914d48ff64104c798ec2869db40cb24b
2018-10-31 09:23:15 -07:00
Junyu Lai
d71b5643bb Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." am: 0d63da86e2 am: 8711dff1be
am: 9f56f04cf9

Change-Id: I9d0d8b67ed0159ba2a71059620ebe5698eb79ccb
2018-10-30 19:56:01 -07:00
Junyu Lai
9f56f04cf9 Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." am: 0d63da86e2
am: 8711dff1be

Change-Id: I3ee791e4b6fdd9d508807810183dc02c69bd2c0b
2018-10-30 19:46:18 -07:00
Junyu Lai
8711dff1be Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on."
am: 0d63da86e2

Change-Id: Ia5120619ce7d5cedd6e558ed4d1dc9a706638796
2018-10-30 19:35:32 -07:00
junyulai
1d103a9809 Fix negative uid stats caused by 464xlat adjust when eBPF is on.
When using xt_qtaguid to count per uid stats,
NetworkStatsService needs to adjust the 464xlat traffic since
iptables module would double count for ipv4 and ipv6 packet.
But for eBPF, the per uid stats is collected in a different
hook, so the adjustment on root uid would only be needed in tx
direction.

Bug: 112226716
Test: 1. Make ipv4 traffic in ipv6-only network and check data
         usage.
      2. Make ipv4 traffic in a client which connect to
         ipv6-only hotspot.
      3. runtest frameworks-net
      4. cts-tradefed run cts -m CtsNetTestCases -t \
                 android.net.cts.TrafficStatsTest
      5. cts-tradefed run cts -m CtsUsageStatsTestCases

Change-Id: Ic9a84f5446eddc943c255d5f3b89dad171f53cac
2018-10-30 21:23:38 +08:00
Luke Huang
301f969054 Merge "Refactor UidRange by using stable aidl structure" am: 1742c23b88 am: 55c7b00f65
am: 7f47d94a18

Change-Id: I82e06fe93a3ed88368b649ef8d3283322191ffe7
2018-10-28 18:06:15 -07:00
Luke Huang
7f47d94a18 Merge "Refactor UidRange by using stable aidl structure" am: 1742c23b88
am: 55c7b00f65

Change-Id: I09ac7fc6525948b76114ef936dc1b3d2d1bae0fb
2018-10-28 17:55:57 -07:00
Luke Huang
55c7b00f65 Merge "Refactor UidRange by using stable aidl structure"
am: 1742c23b88

Change-Id: I9ac52f3869fe051d0ef7f45768f1defad155b53b
2018-10-28 17:44:20 -07:00
Treehugger Robot
1742c23b88 Merge "Refactor UidRange by using stable aidl structure" 2018-10-29 00:17:34 +00:00
Chalard Jean
26ccd359cb Merge "ConnectivityService: make log configurable" am: 3ec9281fa8 am: a7a96dd623
am: 521d6296e2

Change-Id: Iaa8804ce9721bd47a6a26ca1d87d6d69793ba9c8
2018-10-25 23:41:34 -07:00
Chalard Jean
521d6296e2 Merge "ConnectivityService: make log configurable" am: 3ec9281fa8
am: a7a96dd623

Change-Id: I70557edd9750549d91f58f1ca1e841055c69fabc
2018-10-25 23:32:06 -07:00
Junyu Lai
a4f16d8140 Merge "No-op refactoring of VPN lockdown status check." am: f694edec6f am: 436343f70d
am: 7f3b6720c0

Change-Id: I3fb09861c6e6d4c6db2a4105b464018d0b1d8224
2018-10-25 23:28:21 -07:00
Chalard Jean
a7a96dd623 Merge "ConnectivityService: make log configurable"
am: 3ec9281fa8

Change-Id: I5991e26198aa5d5ad809e2585984cb643889a9d1
2018-10-25 23:22:48 -07:00
Chalard Jean
3ec9281fa8 Merge "ConnectivityService: make log configurable" 2018-10-26 06:06:19 +00:00
Junyu Lai
7f3b6720c0 Merge "No-op refactoring of VPN lockdown status check." am: f694edec6f
am: 436343f70d

Change-Id: I4e5609af2b23b333908732a1a12cb6e97815edcc
2018-10-25 22:59:57 -07:00
Xiangyu/Malcolm Chen
80981f9b08 [automerger skipped] Merge changes into pi-dev-plus-aosp
am: ae3f1ec7d0  -s ours

Change-Id: Id2d191ae22884f4380c087ec2aebe7bbbe180e5c
2018-10-25 22:52:45 -07:00