Commit Graph

5419 Commits

Author SHA1 Message Date
Benedict Wong
b33ffcad4b Merge changes from topic "xfrmi-support" am: f928c1e4b9
am: c9884dcec9

Change-Id: I13a826f5ae3c4cb700be789b369848685da1bc41
2018-11-25 19:26:26 -08:00
Benedict Wong
c9884dcec9 Merge changes from topic "xfrmi-support"
am: f928c1e4b9

Change-Id: I9b76a58ab9ebdb9abb01216e8b3916f1f52f9267
2018-11-25 19:15:37 -08:00
Benedict Wong
29ec3e93cd Add XFRM-I support to IpSecService
This change adds support for XFRM-I to all IpSecService netd calls.
Fallback logic is in netd, and thus both VTI and XFRM-I parameters are
always passed down to IpSecService.

Bug: 78589502
Test: All java, CTS tests passing
Change-Id: Ie4186f0ad7e50763b21831f6fa411b5ee436de78
2018-11-21 08:34:54 -08:00
Jack Yu
35ae67807e Merge "Move hidden APIs into system APIs" am: 01a8c6214e
am: eaea5d929e

Change-Id: Ibe6fa27d99791e57b1253a9dc990de0706b52fb6
2018-11-20 19:04:24 -08:00
Jack Yu
eaea5d929e Merge "Move hidden APIs into system APIs"
am: 01a8c6214e

Change-Id: Ic35d305ce0a7e6d0472bfe76ee00034abdd918c5
2018-11-20 18:56:13 -08:00
Jack Yu
01a8c6214e Merge "Move hidden APIs into system APIs" 2018-11-21 02:40:30 +00:00
Etan Cohen
71fc53a797 Merge "Add IPv6 link-local address generation from EUI-48" am: 5d8e697a85
am: 3ec717f4e7

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

Change-Id: I463cc804b21c99512e506b60a44cd62732d3c2b2
2018-11-19 16:38:06 -08:00
Etan Cohen
5d8e697a85 Merge "Add IPv6 link-local address generation from EUI-48" 2018-11-20 00:19:54 +00:00
Jack Yu
13fefdd2f9 Move hidden APIs into system APIs
To allow vendor code to construct LinkAddress, which is
one of the parameter in the system API DataCallResponse.

Test: Build
Bug: 73659459
Merged-In: I3e203781d3a03285fa0e047cc8837ccb4a09016a
Change-Id: I3e203781d3a03285fa0e047cc8837ccb4a09016a
2018-11-19 14:40:13 -08:00
Remi NGUYEN VAN
c8b5f6c112 Merge "(Really) fix LingerMonitor rate limiting" am: 120fa0b015
am: 6ca65797af

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

Change-Id: I3b03f5985137a57e7c3ed3b2e0030078a4ea676d
2018-11-18 23:26:25 -08:00
Treehugger Robot
120fa0b015 Merge "(Really) fix LingerMonitor rate limiting" 2018-11-19 07:14:11 +00:00
Etan Cohen
1b2d62a1bc 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
Lorenzo Colitti
90adb432a9 [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
0d1ed386ed (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
55ae6b7593 Merge "Fix LingerMonitor notification rate limiting" am: 506c6bd17e
am: 160e47e6e1

Change-Id: I17b180a7dc2d06c54d4a6282414b818b83ecdfdc
2018-11-13 01:59:56 -08:00
Remi NGUYEN VAN
160e47e6e1 Merge "Fix LingerMonitor notification rate limiting"
am: 506c6bd17e

Change-Id: I68800c06e8d4413b2e46176a12dc60b436277653
2018-11-13 01:46:21 -08:00
Treehugger Robot
506c6bd17e Merge "Fix LingerMonitor notification rate limiting" 2018-11-13 09:36:39 +00:00
Junyu Lai
5519795666 Merge "Use spy in PermissionMonitorTest." am: c5a03a68d9
am: 1f24248aa7

Change-Id: I9eac5d82c0b5e3eb5593407aa2eb82cb8c71dc2e
2018-11-09 01:11:47 -08:00
Junyu Lai
1f24248aa7 Merge "Use spy in PermissionMonitorTest."
am: c5a03a68d9

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

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

Change-Id: If437d8eadbc81655756b9b7cac1a5cda019a45da
2018-11-08 05:00:10 -08:00
junyulai
96971f770c 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)
2018-11-07 10:16:26 +08:00
soma, kawata
dbfbaf5e63 Add skip464xlat test in Nat464XlatTest
Bug: 69949375
Test: Nat464XlatTest, ConnectivityServiceTest

Change-Id: Ibc66d9c2dc8e3d1f118e5f6940e7b3fd4646efd1
2018-11-06 06:02:50 +00:00
Remi NGUYEN VAN
032dfe5ce5 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
3cb36ae0b0 Merge "Support backward compatibility for restricted network permission" am: 3f6664e4f1
am: 448fae5621

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

Change-Id: I15ef9c6efd40e8fe9bb9ff6ae98cae556dc0f8fd
2018-11-01 00:33:39 -07:00
Paul Hu
3f6664e4f1 Merge "Support backward compatibility for restricted network permission" 2018-11-01 07:20:05 +00:00
paulhu
3c935061bb 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
Junyu Lai
1d05f1be99 Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." am: 0d63da86e2
am: b85f70b758

Change-Id: I3ee791e4b6fdd9d508807810183dc02c69bd2c0b
2018-10-30 19:46:18 -07:00
Junyu Lai
b85f70b758 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
431d07e60a 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
0f950b1d68 Merge "Refactor UidRange by using stable aidl structure" am: e966e640f6
am: be9bc6d666

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

Change-Id: I9ac52f3869fe051d0ef7f45768f1defad155b53b
2018-10-28 17:44:20 -07:00
Treehugger Robot
e966e640f6 Merge "Refactor UidRange by using stable aidl structure" 2018-10-29 00:17:34 +00:00
Chalard Jean
fc92ed7afa Merge "ConnectivityService: make log configurable" am: 4c876ff706
am: e8f66a6625

Change-Id: I70557edd9750549d91f58f1ca1e841055c69fabc
2018-10-25 23:32:06 -07:00
Chalard Jean
e8f66a6625 Merge "ConnectivityService: make log configurable"
am: 4c876ff706

Change-Id: I5991e26198aa5d5ad809e2585984cb643889a9d1
2018-10-25 23:22:48 -07:00
Chalard Jean
4c876ff706 Merge "ConnectivityService: make log configurable" 2018-10-26 06:06:19 +00:00
Junyu Lai
7cba0ca5a2 Merge "No-op refactoring of VPN lockdown status check." am: ec52e89628
am: 866ad8df15

Change-Id: I4e5609af2b23b333908732a1a12cb6e97815edcc
2018-10-25 22:59:57 -07:00
Junyu Lai
866ad8df15 Merge "No-op refactoring of VPN lockdown status check."
am: ec52e89628

Change-Id: I8aab0dd1556b49cafc08d57a8981051ba437fe44
2018-10-25 22:50:34 -07:00
Junyu Lai
ec52e89628 Merge "No-op refactoring of VPN lockdown status check." 2018-10-26 05:35:28 +00:00
Android Build Merger (Role)
0e4d9f8909 Merge changes into pi-dev-plus-aosp 2018-10-26 02:59:16 +00:00
Junyu Lai
eab102426b Merge "Add more debug log when onBlockedStatusChanged was called." am: 4a62810d90
am: cfc3235893

Change-Id: I67665df7729ae7d490fb3f8b41484df6012f257d
2018-10-25 02:45:21 -07:00
Junyu Lai
cfc3235893 Merge "Add more debug log when onBlockedStatusChanged was called."
am: 4a62810d90

Change-Id: I6f5e1af022e43e954b019894a5efb4e6cf8d4846
2018-10-25 02:35:52 -07:00
Junyu Lai
4a62810d90 Merge "Add more debug log when onBlockedStatusChanged was called." 2018-10-25 08:57:56 +00:00
junyulai
4526f99b5e 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
2018-10-25 16:43:50 +08:00
junyulai
3a07d8b87d Add more debug log when onBlockedStatusChanged was called.
Bug: 118355916
Test: 1. runtest frameworks-net
      2. enable/disable battery saver

Change-Id: I6d5f9b49be0defd531fc7ea824668bec7863c4b7
2018-10-25 15:20:01 +08:00