Commit Graph

8656 Commits

Author SHA1 Message Date
Automerger Merge Worker
23b70ef8a6 Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." am: 42fbfe8826 am: 6196f04eed
Change-Id: Ia137b4610408b672cb1e1cdbcdb05a9db2e3c899
2020-03-09 20:16:51 +00:00
Automerger Merge Worker
6196f04eed Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." am: 42fbfe8826
Change-Id: I1336262b19aaa729fb07410eb9aeeb7869f2f88f
2020-03-09 19:59:18 +00:00
Cody Kesting
42fbfe8826 Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." 2020-03-09 15:12:51 +00:00
Automerger Merge Worker
1fa2a65991 [automerger skipped] Merge "Remove polling of TetheringManager in ConnectivityManager." into rvc-dev am: 40f27f9454 -s ours
am skip reason: Change-Id I7d88b38eb3d741534e980b7d1e226a411b71fae2 with SHA-1 156c5b1e46 is in history

Change-Id: I4c306f682bb9ea787bf1bfd8f3e17aa15aae9c3e
2020-03-09 09:07:39 +00:00
Automerger Merge Worker
de03bda1c3 Remove polling of TetheringManager in ConnectivityManager.
Test: manual

Bug: 144742179
Merged-In: I7d88b38eb3d741534e980b7d1e226a411b71fae2
(cherry picked from commit f8a55a19faa938b4e58310f9a90926276b7936ea)

Change-Id: I5cc4231bfb9a0709d677acbb317ee98af31bd041
2020-03-09 06:29:22 +00:00
Automerger Merge Worker
37e766f94d Merge "Remove the NetworkScore class." into rvc-dev am: e34d090bce
Change-Id: I9849a147d568ecf63a3021f42dada2d745a64876
2020-03-09 06:03:18 +00:00
Automerger Merge Worker
d8867b58c5 [automerger skipped] Merge "Add more assertions to testStackedLinkProperties." into rvc-dev am: 78c79bec07 -s ours
am skip reason: Change-Id I7d111382be215a926a7d7d4701bd3c3e94372b99 with SHA-1 2e6a35ef5e is in history

Change-Id: I9d9754032c5a29d9054348948abf41c0fc279332
2020-03-09 06:02:55 +00:00
Chalard Jean
e34d090bce Merge "Remove the NetworkScore class." into rvc-dev 2020-03-09 05:54:30 +00:00
Automerger Merge Worker
6c8105baa0 [automerger skipped] Merge "test: ConnectivityService: Validate Route Add/Del" into rvc-dev am: 50fa7818c1 -s ours
am skip reason: Change-Id I18296b933e856a0f8a4c1dbd75bd35024853bfbb with SHA-1 5668f7198b is in history

Change-Id: Iec5d19ff2ca184cfe0b38976e0817fb0e958ae0d
2020-03-09 05:35:27 +00:00
Automerger Merge Worker
49d3fca273 [automerger skipped] Merge "test: LinkProperties: Unique Route Destinations" into rvc-dev am: cfc4030739 -s ours
am skip reason: Change-Id I238899b0643407a1be29eb66d28728ca5d5dbc80 with SHA-1 44999a7247 is in history

Change-Id: I34004ebf134fa2698b0dd49f2ccc9e341d8bdd97
2020-03-09 05:34:45 +00:00
Automerger Merge Worker
4527faa944 Merge "Ignore NetworkAgentConfigTest on Q" am: b6871630d7 am: 42eac89804
Change-Id: I5e2d10bac0a623f92a2fcf58f57865761dfd0ea4
2020-03-09 05:22:45 +00:00
Automerger Merge Worker
5bab557100 Merge "Skip LinkAddress tests that are R-specific on Q" am: b2f8f992ba am: e7fa2e1710
Change-Id: I111cbc2a1c845adb67a80ccb7833784b835190fd
2020-03-09 05:22:31 +00:00
Automerger Merge Worker
9c7d889f22 Merge "Ignore testReevaluateNetwork until Q" am: 48f2c29253 am: 05fee52ee7
Change-Id: Id902b448c0dba503b7701ff3974b6ae8433a0be8
2020-03-09 05:21:49 +00:00
Automerger Merge Worker
42eac89804 Merge "Ignore NetworkAgentConfigTest on Q" am: b6871630d7
Change-Id: I4626672d2e5e96c7f249f34850f490199d82b06c
2020-03-09 05:12:17 +00:00
Automerger Merge Worker
e7fa2e1710 Merge "Skip LinkAddress tests that are R-specific on Q" am: b2f8f992ba
Change-Id: I9221f3dbe00d9994b73c973cb61a59da7d32b0ac
2020-03-09 05:12:00 +00:00
Automerger Merge Worker
05fee52ee7 Merge "Ignore testReevaluateNetwork until Q" am: 48f2c29253
Change-Id: I0c8c1ecba97100efc49c2ec776af83a60160bd44
2020-03-09 05:11:40 +00:00
Remi NGUYEN VAN
b6871630d7 Merge "Ignore NetworkAgentConfigTest on Q" 2020-03-09 05:03:20 +00:00
Remi NGUYEN VAN
b2f8f992ba Merge "Skip LinkAddress tests that are R-specific on Q" 2020-03-09 05:00:33 +00:00
Remi NGUYEN VAN
48f2c29253 Merge "Ignore testReevaluateNetwork until Q" 2020-03-09 05:00:12 +00:00
Automerger Merge Worker
e58e7a4d85 Add more assertions to testStackedLinkProperties.
Check all routes that are added and removed instead of just some
of them. This is in preparation of an upcoming change that
switches to adding and creating routes by issuing direct calls to
netd.

Also rename the misleading ipv4Default route variable to
ipv4Subnet, which is what it actually is.

Bug: 142892223
Test: test-only change
Change-Id: I7d111382be215a926a7d7d4701bd3c3e94372b99
Merged-In: I7d111382be215a926a7d7d4701bd3c3e94372b99
(cherry picked from commit dcb35cb9a5d1c250e6564b6e66a4b436dd11c795)
2020-03-09 03:48:15 +00:00
Automerger Merge Worker
76eead56aa Remove the NetworkScore class.
This class is useless at this point and introduces overhead.

Bug: 113554781
Test: FrameworksNetTests
Change-Id: Ib5f540070222865260c16c7182cc13c710a243c2
Merged-In: Ib5f540070222865260c16c7182cc13c710a243c2
(cherry picked from commit c3489ad3a6ce98218ce223cea877586781025b98)
2020-03-09 03:46:34 +00:00
Automerger Merge Worker
13a85611f8 test: ConnectivityService: Validate Route Add/Del
Validate route addition and deletion after linkProperties are
changed.

Bug: 142892223
Test: atest ConnectivityServiceTest#testStackedLinkProperties
Change-Id: I18296b933e856a0f8a4c1dbd75bd35024853bfbb
Merged-In: I18296b933e856a0f8a4c1dbd75bd35024853bfbb
(cherry picked from commit a22a979a0caf3e3533ede410d48127084052aec5)
2020-03-09 03:36:10 +00:00
Automerger Merge Worker
87cdb7c771 test: LinkProperties: Unique Route Destinations
Routes will always have unique destinations. Update tests
to use unique destinations when adding multiple routes.

Bug: 142892223
Test: treehugger
Change-Id: I238899b0643407a1be29eb66d28728ca5d5dbc80
Merged-In: I238899b0643407a1be29eb66d28728ca5d5dbc80
(cherry picked from commit 891ea460b10c3ee3c74298dad828bd550e66b81f)
2020-03-09 03:33:03 +00:00
Remi NGUYEN VAN
186adbf536 Ignore NetworkAgentConfigTest on Q
NetworkAgentConfig did not exist on Q.

Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
          on Q and R devices
Bug: 150918852
Change-Id: I5414d7767c39327ff41673ff13ccd34982e10742
2020-03-09 12:04:39 +09:00
Remi NGUYEN VAN
1306f533e6 Skip LinkAddress tests that are R-specific on Q
Address lifetime was added in R so tests for it should not be run on Q.

Test: CtsNetTestCasesLatestSdk:android.net.LinkAddressTest on both
          devices
Bug: 150918852
Change-Id: I98b14727eabcf569829eee8df34afc057eba6f93
2020-03-09 10:42:53 +09:00
Automerger Merge Worker
8f44cbe098 Merge "Remove the NetworkScore class." am: d88d10a100 am: 1f3fab6597
Change-Id: I5a14c3488b1f7011d49134819f659e3864b85f16
2020-03-08 05:26:15 +00:00
Automerger Merge Worker
1f3fab6597 Merge "Remove the NetworkScore class." am: d88d10a100
Change-Id: Ieb78467dac3aca48eea9d049b83a74f9ff41eec7
2020-03-08 05:11:03 +00:00
Treehugger Robot
d88d10a100 Merge "Remove the NetworkScore class." 2020-03-08 04:52:26 +00:00
Remi NGUYEN VAN
df86d7b416 Ignore testReevaluateNetwork until Q
The method did not exist until Q, so the test is not relevant on such
devices.

Test: atest CtsNetTestCasesLatestSdk:android.net.CaptivePortalTest on Q
          and R devices
Bug: 150918852
Change-Id: I913b6eaa61bfd4f1964b324dcb4dd272aa8cc583
2020-03-06 18:21:45 +09:00
Automerger Merge Worker
21d2719637 [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" into stage-aosp-master am: 319b248b90 -s ours
am skip reason: Change-Id Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef with SHA-1 2429c7091c is in history

Change-Id: I41f8a5df178458326bf0a1382a4b0c28eddda702
2020-03-06 06:15:02 +00:00
Aaron Huang
319b248b90 Merge "Remove framework code that has moved to frameworks/libs/net" into stage-aosp-master 2020-03-06 05:53:20 +00:00
Chalard Jean
8cdee3a431 Remove the NetworkScore class.
This class is useless at this point and introduces overhead.

Bug: 113554781
Test: FrameworksNetTests
Change-Id: Ib6da6c1c7f2a0b97c847d2e64e5ce16dd821e1e7
2020-03-06 11:57:53 +09:00
Automerger Merge Worker
156c5b1e46 Merge "Remove polling of TetheringManager in ConnectivityManager." am: d43d33333c am: c1314bb84f
Change-Id: I7d88b38eb3d741534e980b7d1e226a411b71fae2
2020-03-06 00:38:43 +00:00
Automerger Merge Worker
798b54a1c5 [automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 0a38409fb1 am: f01b99332b -s ours
am skip reason: subject contains skip directive

Change-Id: I25e889bad69a7a3bfd819e7a75a69a16f29b92da
2020-03-06 00:26:36 +00:00
Amos Bianchi
d43d33333c Merge "Remove polling of TetheringManager in ConnectivityManager." 2020-03-05 18:34:59 +00:00
Amos Bianchi
a9b415a49d Remove polling of TetheringManager in ConnectivityManager.
Test: manual

Bug: 144742179

Change-Id: I196b320788be96c120f771d2fcdf032a73e26b5f
2020-03-05 18:34:14 +00:00
Bill Yi
0a38409fb1 Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" 2020-03-05 18:27:30 +00:00
Aaron Huang
adfebb8b5c Remove framework code that has moved to frameworks/libs/net
Add srcs to framework and change import path.
Remove the codes which are moved to frameworks/libs/net.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Bug: 143925787
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I44e0a8361637c2d43be2e5d033d405b22e1a149c
Merged-In: I067cdc404e5a63947c19cb75069a39ae42faa3c8
Merged-In: Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef
2020-03-05 13:53:39 +08:00
Cody Kesting
7febafb11c Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics.
ConnectivityDiagnostics shares NetworkCapabilities in
ConnectivityReports and DataStallReports. These NetworkCapabilities need
to have their UIDs scrubbed before they are shared with callbacks.

Bug: 148942124
Test: atest FrameworksNetTests
Change-Id: I5bde5a8116f7e36b8f4de49adf4cab8ec45a5aa4
2020-03-04 08:40:11 -08:00
Automerger Merge Worker
010eaf890e Merge changes I794a24d0,Iab32b2db am: 22d91b660a am: 62e64ad839
Change-Id: If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7
2020-03-04 13:36:11 +00:00
Automerger Merge Worker
62e64ad839 Merge changes I794a24d0,Iab32b2db am: 22d91b660a
Change-Id: I03f6b9e521793b92f83a21583a2e53fb1d31fba1
2020-03-04 13:26:51 +00:00
Junyu Lai
22d91b660a Merge changes I794a24d0,Iab32b2db
* changes:
  Remove setHandler in NetworkStatsService
  Remove the need of accessing handler in NSS unit test
2020-03-04 13:07:49 +00:00
Automerger Merge Worker
6c718d0481 Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" am: 9f1fa12186 am: 3c77725b74
Change-Id: Ifb0b5b9742a9a4c0c4c1845c647184d65cff8e4f
2020-03-04 10:50:48 +00:00
Automerger Merge Worker
3c77725b74 Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" am: 9f1fa12186
Change-Id: I1ab6d47c17992f8630d9aba892bcef29dcb66bfa
2020-03-04 10:32:09 +00:00
Paul Hu
9f1fa12186 Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" 2020-03-04 10:15:41 +00:00
junyulai
c05d1359b4 Remove setHandler in NetworkStatsService
Currently, internal handler is set by setHandler after
constructing NSS object. This was introduced in ag/866187 to
access the handler in the unit test.

However, the design put NSS in a bad situation where all classes
that need handler or executor could not be final and need to be
dynamically allocated in order to get a valid handler.

Thus, since the usage of handler is removed in previous patch,
this change eliminate setHandler by initializing the handler in
the constructor.

Test: atest FrameworksNetTests
Bug: 150664039

Change-Id: I794a24d00b0ca9fdc78091e7b9ab7307e0f034b7
2020-03-04 16:01:21 +08:00
Automerger Merge Worker
a698836db0 Merge "Add more assertions to testStackedLinkProperties." am: bb77aa9ddd am: d778ebc099
Change-Id: I4f5dc651847aae2dfc61b1f5234bab5f899feacb
2020-03-04 04:53:17 +00:00
Automerger Merge Worker
d778ebc099 Merge "Add more assertions to testStackedLinkProperties." am: bb77aa9ddd
Change-Id: I6987dc9c80b8d48c8354f654f21b056d2bd896c5
2020-03-04 04:36:38 +00:00
Lorenzo Colitti
bb77aa9ddd Merge "Add more assertions to testStackedLinkProperties." 2020-03-04 04:24:34 +00:00
paulhu
b6ba8e84f4 Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider
Registering/Unregistering network provider needs NETWORK_FACTORY
which is signature only permission. But mainline modules can't
grant this permission because it's not signed with platform key.
Hence, these APIs should also accept MAINLINE_NETWORK_STACK
permission that allow mainline module to register/unregister
network provider.

Bug: 150733435
Test: atest FrameworksNetTests
Change-Id: Id22113aa0db01244817b4b008f5573c5e7b317f0
2020-03-04 09:43:41 +08:00