joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity
5,412 commits 1 branch 0 tags 204 MiB
Commit graph

5,412 commits

This branch
This branch
All branches
Message SHA1
Merge "Add IPv6 link-local address generation from EUI-48" am: 5d8e697a85 
am: 3ec717f4e7

Change-Id: I63de4fa185649d9389a771860c479899e90b37e4

Etan Cohen   authored and   android-build-merger   commited 2018-11-19 16:48:22 -08:00
71fc53a797
Merge "Add IPv6 link-local address generation from EUI-48" 
am: 5d8e697a85

Change-Id: I463cc804b21c99512e506b60a44cd62732d3c2b2

Etan Cohen   authored and   android-build-merger   commited 2018-11-19 16:38:06 -08:00
3ec717f4e7
Merge "Add IPv6 link-local address generation from EUI-48"
Etan Cohen   authored and   Gerrit Code Review   commited 2018-11-20 00:19:54 +00:00
5d8e697a85
Merge "(Really) fix LingerMonitor rate limiting" am: 120fa0b015 
am: 6ca65797af

Change-Id: I55d69d0bf1102b4159db5ffb4a37684f7a676008

Remi NGUYEN VAN   authored and   android-build-merger   commited 2018-11-18 23:40:38 -08:00
c8b5f6c112
Merge "(Really) fix LingerMonitor rate limiting" 
am: 120fa0b015

Change-Id: I3b03f5985137a57e7c3ed3b2e0030078a4ea676d

Remi NGUYEN VAN   authored and   android-build-merger   commited 2018-11-18 23:26:25 -08:00
6ca65797af
Merge "(Really) fix LingerMonitor rate limiting"
Treehugger Robot   authored and   Gerrit Code Review   commited 2018-11-19 07:14:11 +00:00
120fa0b015
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

Etan Cohen   commited 2018-11-16 21:50:24 -08:00
1b2d62a1bc
[automerger skipped] Merge changes from topic "sort stats" into pi-dev 
am: 664145dcbc  -s ours

Change-Id: Iaf2d41bf8c4464e05f8733d453fcc1a168ef8323

Lorenzo Colitti   authored and   android-build-merger   commited 2018-11-16 05:41:50 -08:00
90adb432a9
(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

Remi NGUYEN VAN   commited 2018-11-16 14:53:14 +09:00
0d1ed386ed
Merge "Fix LingerMonitor notification rate limiting" am: 506c6bd17e 
am: 160e47e6e1

Change-Id: I17b180a7dc2d06c54d4a6282414b818b83ecdfdc

Remi NGUYEN VAN   authored and   android-build-merger   commited 2018-11-13 01:59:56 -08:00
55ae6b7593
Merge "Fix LingerMonitor notification rate limiting" 
am: 506c6bd17e

Change-Id: I68800c06e8d4413b2e46176a12dc60b436277653

Remi NGUYEN VAN   authored and   android-build-merger   commited 2018-11-13 01:46:21 -08:00
160e47e6e1
Merge "Fix LingerMonitor notification rate limiting"
Treehugger Robot   authored and   Gerrit Code Review   commited 2018-11-13 09:36:39 +00:00
506c6bd17e
Merge "Use spy in PermissionMonitorTest." am: c5a03a68d9 
am: 1f24248aa7

Change-Id: I9eac5d82c0b5e3eb5593407aa2eb82cb8c71dc2e

Junyu Lai   authored and   android-build-merger   commited 2018-11-09 01:11:47 -08:00
5519795666
Merge "Use spy in PermissionMonitorTest." 
am: c5a03a68d9

Change-Id: I6074b6fb2f90821ddad93db18fbb633225b4292f

Junyu Lai   authored and   android-build-merger   commited 2018-11-09 01:01:25 -08:00
1f24248aa7
Merge "Use spy in PermissionMonitorTest."
Junyu Lai   authored and   Gerrit Code Review   commited 2018-11-09 08:47:03 +00:00
c5a03a68d9
Use spy in PermissionMonitorTest. 
Bug: 118811303
Test: runtest frameworks-net
Change-Id: Id61a9efecf1d1ed5a9045b78ecfec9239e13967b

junyulai   commited 2018-11-09 12:37:16 +08:00
2c54072845
Merge "Add skip464xlat test in Nat464XlatTest" am: aef8fe0d47 
am: 0b6a961580

Change-Id: Iee577b9b65ca9b576da966d6ca2468da9aa749ef

soma, kawata   authored and   android-build-merger   commited 2018-11-08 05:10:10 -08:00
d19ffbadd2
Merge "Add skip464xlat test in Nat464XlatTest" 
am: aef8fe0d47

Change-Id: If437d8eadbc81655756b9b7cac1a5cda019a45da

soma, kawata   authored and   android-build-merger   commited 2018-11-08 05:00:10 -08:00
0b6a961580
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 431d07e60a)

junyulai   commited 2018-11-07 10:16:26 +08:00
96971f770c
Add skip464xlat test in Nat464XlatTest 
Bug: 69949375
Test: Nat464XlatTest, ConnectivityServiceTest

Change-Id: Ibc66d9c2dc8e3d1f118e5f6940e7b3fd4646efd1

soma, kawata   authored and   Chalard Jean   commited 2018-11-06 06:02:50 +00:00
dbfbaf5e63
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

Remi NGUYEN VAN   commited 2018-11-02 17:26:37 +09:00
032dfe5ce5
Merge "Support backward compatibility for restricted network permission" am: 3f6664e4f1 
am: 448fae5621

Change-Id: I9b2faf60ff007e2cc08dacd6988fe98377468e7e

Paul Hu   authored and   android-build-merger   commited 2018-11-01 00:46:15 -07:00
3cb36ae0b0
Merge "Support backward compatibility for restricted network permission" 
am: 3f6664e4f1

Change-Id: I15ef9c6efd40e8fe9bb9ff6ae98cae556dc0f8fd

Paul Hu   authored and   android-build-merger   commited 2018-11-01 00:33:39 -07:00
448fae5621
Merge "Support backward compatibility for restricted network permission"
Paul Hu   authored and   Gerrit Code Review   commited 2018-11-01 07:20:05 +00:00
3f6664e4f1
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

paulhu   commited 2018-11-01 10:38:11 +08:00
3c935061bb
Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." am: 0d63da86e2 
am: b85f70b758

Change-Id: I3ee791e4b6fdd9d508807810183dc02c69bd2c0b

Junyu Lai   authored and   android-build-merger   commited 2018-10-30 19:46:18 -07:00
1d05f1be99
Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." 
am: 0d63da86e2

Change-Id: Ia5120619ce7d5cedd6e558ed4d1dc9a706638796

Junyu Lai   authored and   android-build-merger   commited 2018-10-30 19:35:32 -07:00
b85f70b758
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

junyulai   commited 2018-10-30 21:23:38 +08:00
431d07e60a
Merge "Refactor UidRange by using stable aidl structure" am: e966e640f6 
am: be9bc6d666

Change-Id: I09ac7fc6525948b76114ef936dc1b3d2d1bae0fb

Luke Huang   authored and   android-build-merger   commited 2018-10-28 17:55:57 -07:00
0f950b1d68
Merge "Refactor UidRange by using stable aidl structure" 
am: e966e640f6

Change-Id: I9ac52f3869fe051d0ef7f45768f1defad155b53b

Luke Huang   authored and   android-build-merger   commited 2018-10-28 17:44:20 -07:00
be9bc6d666
Merge "Refactor UidRange by using stable aidl structure"
Treehugger Robot   authored and   Gerrit Code Review   commited 2018-10-29 00:17:34 +00:00
e966e640f6
Merge "ConnectivityService: make log configurable" am: 4c876ff706 
am: e8f66a6625

Change-Id: I70557edd9750549d91f58f1ca1e841055c69fabc

Chalard Jean   authored and   android-build-merger   commited 2018-10-25 23:32:06 -07:00
fc92ed7afa
Merge "ConnectivityService: make log configurable" 
am: 4c876ff706

Change-Id: I5991e26198aa5d5ad809e2585984cb643889a9d1

Chalard Jean   authored and   android-build-merger   commited 2018-10-25 23:22:48 -07:00
e8f66a6625
Merge "ConnectivityService: make log configurable"
Chalard Jean   authored and   Gerrit Code Review   commited 2018-10-26 06:06:19 +00:00
4c876ff706
Merge "No-op refactoring of VPN lockdown status check." am: ec52e89628 
am: 866ad8df15

Change-Id: I4e5609af2b23b333908732a1a12cb6e97815edcc

Junyu Lai   authored and   android-build-merger   commited 2018-10-25 22:59:57 -07:00
7cba0ca5a2
Merge "No-op refactoring of VPN lockdown status check." 
am: ec52e89628

Change-Id: I8aab0dd1556b49cafc08d57a8981051ba437fe44

Junyu Lai   authored and   android-build-merger   commited 2018-10-25 22:50:34 -07:00
866ad8df15
Merge "No-op refactoring of VPN lockdown status check."
Junyu Lai   authored and   Gerrit Code Review   commited 2018-10-26 05:35:28 +00:00
ec52e89628
Merge changes into pi-dev-plus-aosp
Android Build Merger (Role)   authored and   Android (Google) Code Review   commited 2018-10-26 02:59:16 +00:00
0e4d9f8909
Merge "Add more debug log when onBlockedStatusChanged was called." am: 4a62810d90 
am: cfc3235893

Change-Id: I67665df7729ae7d490fb3f8b41484df6012f257d

Junyu Lai   authored and   android-build-merger   commited 2018-10-25 02:45:21 -07:00
eab102426b
Merge "Add more debug log when onBlockedStatusChanged was called." 
am: 4a62810d90

Change-Id: I6f5e1af022e43e954b019894a5efb4e6cf8d4846

Junyu Lai   authored and   android-build-merger   commited 2018-10-25 02:35:52 -07:00
cfc3235893
Merge "Add more debug log when onBlockedStatusChanged was called."
Junyu Lai   authored and   Gerrit Code Review   commited 2018-10-25 08:57:56 +00:00
4a62810d90
No-op refactoring of VPN lockdown status check. 
Currently, if VPN lockdown is disabled, the blocking judgement
inside VPN will return false immediately. It will make
ConnectivityService hard to check blocked status by a given
VPN lockdown status.

Thus, move this check into ConnectivityService and check it
externally.

Bug: 117814902
Test: 1. manual test with 3rd-party vpn app
      2. runtest frameworks-net

Change-Id: Ia8319b1a1a12f1058c24badf2431f2ec69bc78e7

junyulai   commited 2018-10-25 16:43:50 +08:00
4526f99b5e
Add more debug log when onBlockedStatusChanged was called. 
Bug: 118355916
Test: 1. runtest frameworks-net
      2. enable/disable battery saver

Change-Id: I6d5f9b49be0defd531fc7ea824668bec7863c4b7

junyulai   commited 2018-10-25 15:20:01 +08:00
3a07d8b87d
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 6155b25f24 -s ours 
am: 82c3e8e924  -s ours

Change-Id: If860aa9619b4655886dfdac1528940e5e30446fe

Bill Yi   authored and   android-build-merger   commited 2018-10-24 19:40:40 -07:00
379b7cd888
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE 
am: 6fab283a18  -s ours

Change-Id: If3b4a8fabee7b9b74e345d59505040e45588f9e7

Bill Yi   authored and   android-build-merger   commited 2018-10-24 17:20:17 -07:00
d4b216e0e2
Merge "To support skip464xlat per Network" am: 2d23f14c9e 
am: e826aa52e4

Change-Id: I944738258051525b371bd17dd3ee7b411b82d12b

Chalard Jean   authored and   android-build-merger   commited 2018-10-24 17:19:51 -07:00
153c48b434
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE 
am: 6155b25f24  -s ours

Change-Id: I2c4b9184789a1bdae2cec06e0e72f6c6ca049113

Bill Yi   authored and   android-build-merger   commited 2018-10-24 17:17:46 -07:00
82c3e8e924
Merge "Move some members to the "Q blacklist"." am: 8d6a9818f0 
am: 13c9e7e2f3

Change-Id: Ia2419cce28d26d9464da2a5172cb332b629e943e

Nathan Harold   authored and   android-build-merger   commited 2018-10-24 16:14:06 -07:00
ab447742ee
Merge pie-platform-release to aosp-master - DO NOT MERGE 
Change-Id: I695db52f5e22509401258e8b083e7650d401d993

Bill Yi   commited 2018-10-24 14:48:44 -07:00
6155b25f24
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE 
Change-Id: I13571b072111900d0979f026670e648cdef9899b

Bill Yi   commited 2018-10-24 09:08:38 -07:00
6fab283a18