Commit Graph

5558 Commits

Author SHA1 Message Date
Lorenzo Colitti
d3ff9edba2 [automerger skipped] Merge changes from topic "sort stats" into pi-dev am: 664145dcbc -s ours
am: 90adb432a9  -s ours

Change-Id: Ifb8171b56932ef6b7c70a0ff36ebacc4ee7801db
2018-11-16 05:56:23 -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
fb2f59f470 Merge "Fix LingerMonitor notification rate limiting" am: 506c6bd17e am: 160e47e6e1
am: 55ae6b7593

Change-Id: I1cdc817a27b7e966837d9c56f7e93b8bc917c6c0
2018-11-13 02:12:51 -08: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
4d7af8bdec Merge "Use spy in PermissionMonitorTest." am: c5a03a68d9 am: 1f24248aa7
am: 5519795666

Change-Id: I1478b9c2bb12b6bfd161be99c5faa7aec76d9a7f
2018-11-09 14:16:41 -08: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
262458429e Merge "Add skip464xlat test in Nat464XlatTest" am: aef8fe0d47 am: 0b6a961580
am: d19ffbadd2

Change-Id: I9d59f05ee0d73c5df8351de1332ee0a5924ae8e8
2018-11-08 05:26:30 -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
Roshan Pius
9764f0bc6f 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
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
9d3bba19a3 Merge "Support backward compatibility for restricted network permission" am: 3f6664e4f1 am: 448fae5621
am: 3cb36ae0b0

Change-Id: Icdf485f714e05fa8500ea785230444fbeac98cc5
2018-11-01 01:13:32 -07: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
Roshan Pius
7e9a60d21c 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
4e39776de9 Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." am: 0d63da86e2 am: b85f70b758
am: 1d05f1be99

Change-Id: I9d0d8b67ed0159ba2a71059620ebe5698eb79ccb
2018-10-30 19:56:01 -07: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
475e21aa31 Merge "Refactor UidRange by using stable aidl structure" am: e966e640f6 am: be9bc6d666
am: 0f950b1d68

Change-Id: I82e06fe93a3ed88368b649ef8d3283322191ffe7
2018-10-28 18:06:15 -07: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
0c6c5e09e3 Merge "ConnectivityService: make log configurable" am: 4c876ff706 am: e8f66a6625
am: fc92ed7afa

Change-Id: Iaa8804ce9721bd47a6a26ca1d87d6d69793ba9c8
2018-10-25 23:41:34 -07:00
Chalard Jean
fc92ed7afa Merge "ConnectivityService: make log configurable" am: 4c876ff706
am: e8f66a6625

Change-Id: I70557edd9750549d91f58f1ca1e841055c69fabc
2018-10-25 23:32:06 -07:00
Junyu Lai
4c3b39029f Merge "No-op refactoring of VPN lockdown status check." am: ec52e89628 am: 866ad8df15
am: 7cba0ca5a2

Change-Id: I3fb09861c6e6d4c6db2a4105b464018d0b1d8224
2018-10-25 23:28:21 -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
Xiangyu/Malcolm Chen
f7bb4b9bef [automerger skipped] Merge changes into pi-dev-plus-aosp
am: 0e4d9f8909  -s ours

Change-Id: Id2d191ae22884f4380c087ec2aebe7bbbe180e5c
2018-10-25 22:52:45 -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
Junyu Lai
aa275776c6 Merge "Add more debug log when onBlockedStatusChanged was called." am: 4a62810d90 am: cfc3235893
am: eab102426b

Change-Id: I286f5b57ca95234e916da6adb6ceedbd1584107e
2018-10-25 21:53:18 -07:00
Bill Yi
18fbfe771c [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 6155b25f24 -s ours am: 82c3e8e924 -s ours
am: 379b7cd888  -s ours

Change-Id: I75b649236c9bc42d627dd79d055e38b26e20fa40
2018-10-25 21:14:17 -07:00
Bill Yi
a532b9e457 [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 6fab283a18 -s ours
am: d4b216e0e2  -s ours

Change-Id: Ibe80ad8a60c74e954623c543607573491754cd2e
2018-10-25 20:12:57 -07:00
Chalard Jean
bf8a3d0a42 Merge "To support skip464xlat per Network" am: 2d23f14c9e am: e826aa52e4
am: 153c48b434

Change-Id: I4a6d7480e2e7e775e511cc7eaaabe65b6a3bde7d
2018-10-25 20:09:15 -07:00
Android Build Merger (Role)
0e4d9f8909 Merge changes into pi-dev-plus-aosp 2018-10-26 02:59:16 +00:00
Nathan Harold
955943491b [automerger skipped] Merge "Move some members to the "Q blacklist"." am: 8d6a9818f0 am: 13c9e7e2f3
am: ab447742ee  -s ours

Change-Id: I56c4b05166a7299da177e4a0f98a7aa2003d7dc6
2018-10-25 19:02:07 -07: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