Commit Graph

8714 Commits

Author SHA1 Message Date
Chalard Jean
2616b2bbb0 Address further API council comments. am: c882f64b3c
Change-Id: I539d05a584c40606f0f27bff06e9585407b53cd8
2020-03-27 22:58:41 +00:00
Chalard Jean
750bd91aa5 Update the NetworkProvider API for council comments am: 4c7368a340
Change-Id: If7798e35b8c8f4ba4b70cedd9689dcf84caf140f
2020-03-27 22:58:34 +00:00
Cody Kesting
ede1ab6af0 Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: fc0eed5aa6
Change-Id: Icff8ed1cf90927e521c8294aaec8bfdd6a4ccc4d
2020-03-27 19:23:37 +00:00
Cody Kesting
fc0eed5aa6 Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev 2020-03-27 19:09:00 +00:00
Cody Kesting
f4597a69da Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 488c8e4734
Change-Id: Ibd8c0920b66899d36058f249904d33fe14ce9504
2020-03-27 18:38:07 +00:00
Cody Kesting
488c8e4734 Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev 2020-03-27 18:22:20 +00:00
Chalard Jean
c882f64b3c Address further API council comments.
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I8a785ae0e74e659c317deaaa28c203356c7766ed
2020-03-27 17:57:24 +09:00
Chalard Jean
4c7368a340 Update the NetworkProvider API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Change-Id: I6b086572cfc72a0727f4510351cff0e74cbc4302
2020-03-27 17:53:05 +09:00
Chalard Jean
a51e3d1b49 Merge changes from topic "networkagent_api" into rvc-dev am: 6d25213263
Change-Id: Ie7e013eabbe39c96dc058c25aed520093131771e
2020-03-27 06:23:44 +00:00
Chalard Jean
6d25213263 Merge changes from topic "networkagent_api" into rvc-dev
* changes:
  Update NetworkAgentConfig API for council comments
  Update the NetworkAgent API for council comments
2020-03-27 06:20:37 +00:00
Chalard Jean
74fe1c7205 Update NetworkAgentConfig API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Change-Id: Idca9f243a5c955f4caa30921ee520e1a93b0d11a
2020-03-25 22:43:13 +09:00
Chalard Jean
cb4711edd8 Update the NetworkAgent API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Change-Id: I9a2691f783f4449348c3f767568e05620f0b9df5
2020-03-25 22:35:41 +09:00
Chalard Jean
63d2ac344e Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" into rvc-dev am: 09b1ee6077
Change-Id: I8d89e1e9737404d5ed47c8ab83d7d3dfa374a3bf
2020-03-25 13:19:40 +00:00
Chalard Jean
136a2fe2a6 Allow MANAGE_TEST_NETWORKS to register limited agents
This puts in force some restrictions against test networks,
and in exchange relaxes the restrictions around registering
a network agent that provides a test network.
Test networks can only ever have transport TEST, and have
only a few capabilities available to them.

This is useful in particular to test CTS. See aosp/1253423
for first, basic usage of this capability.

Test: IpSecManagerTunnelTest
Test: new CTS aosp/1253423
Bug: 139268426

Change-Id: Ibd162792a7ab02fcbb06130f21a825a386678c05
(cherry picked from commit 2c129e97cca2234ee6dd079a9c07df0c530d8b36)
2020-03-25 10:43:26 +00:00
Aaron Huang
9b204d096d Merge "API review: make exception class and Builder final" into rvc-dev am: 9c9366b2df
Change-Id: I520c6df0ed11e24dfbb6e5c394d68e7761d515f2
2020-03-25 09:47:22 +00:00
Aaron Huang
1d4b09a9fa API review: make exception class and Builder final
- InvalidPacketException exception class should be final
- NetworkCapabilities.Builder should be final

Bug: 152203926
Test: atest FrameworksNetTests
Change-Id: If9b799151aff6d41c9bcd8bb86c65a58e46bad73
2020-03-25 13:36:38 +08:00
Lucas Lin
7e0c604648 Merge "Fix NetworkCapabilitiesTest fail on Q device" into rvc-dev am: b3d186dda8
Change-Id: I2abfbcfbf39d9b82e581d91c873481ef4327cacb
2020-03-25 02:09:28 +00:00
Lucas Lin
b3d186dda8 Merge "Fix NetworkCapabilitiesTest fail on Q device" into rvc-dev 2020-03-25 02:00:35 +00:00
lucaslin
e0bf23d34f Fix NetworkCapabilitiesTest fail on Q device
The getSSID() has changed to getSsid() in Android R, adding
isAtLeastR() to prevent NetworkCapabilitiesTest fail on Android
Q.

Bug: 151322799
Test: Run "atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest"
      on Android Q & R device.
Change-Id: I602ae32dae1ad29fe3293c541fa6d2cef01b81d3
2020-03-24 19:00:09 +08:00
TreeHugger Robot
9a7a0f80e6 Merge "Fix addRoute replace default route unexpectedly" into rvc-dev am: 887941cbc8
Change-Id: I975b793977c7ea01c71f603fa2912373ffc5aaaf
2020-03-24 10:51:09 +00:00
Treehugger Robot
77a77390cb Fix addRoute replace default route unexpectedly
In aosp/1203789, if two routes are with the same destination,
it will be replaced instead of added when calling addRoute.
This breaks scenarios which rely on the ability to add multiple
default routes, such as multiple IPv6 default routes learned
via address autoconfiguration.

This change treats the route is an update if the destination
and nexthop are the same, but different in other properties.

Test: atest OffloadControllerTest#testSetUpstreamLinkPropertiesWorking
Test: atest LinkPropertiesUtilsTest#testLinkPropertiesIdenticalEqual
Test: atest ConnectivityServiceTest#testStackedLinkProperties
Test: atest ConnectivityServiceTest#testRouteAddDeleteUpdate
  (only directly related tests are listed)
Fix: 152170074
Fix: 151911339
Bug: 142892223

Change-Id: I7153ec9866f14a109ba8155c905e5d9e4f85eb64
Merged-In: I7153ec9866f14a109ba8155c905e5d9e4f85eb64
(cherry picked from commit 11aa9cb44aee289329b306cfc51a73cfe1456b61)
2020-03-24 08:41:44 +00:00
Automerger Merge Worker
aa7f80a5d8 Clean up unit testing for ConnectivityDiagnostics.
Connectivity Diagnostics included an unnecessary try-catch for verifying
that the permissions check for invoking ConnectivityDiagnosticsCallbacks
doesn't throw when the uid and package name do not match.

Bug: 149119324
Test: atest FrameworksNetTests
Change-Id: Ie302b1f4f437e819fdd15ec28adb0b56750c2c53
Merged-In: Ie302b1f4f437e819fdd15ec28adb0b56750c2c53
(cherry picked from commit 66b5e081b785a3b7e2a032342d4d424905581cf9)
2020-03-23 17:35:15 -07:00
Cody Kesting
e14e1869aa Restrict VPN Diagnostics callbacks to underlying networks.
ConnectivityDiagnosticsCallbacks should only be invoked for the
underlying networks declared by active VPNs. This encourages VPN apps to
declare their underlying networks.

The previous permission model for VPNs allowed active VPNs to receive
callbacks on any network.

Bug: 148903617
Test: atest FrameworksNetTests
Change-Id: Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b
Merged-In: Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b
(cherry picked from commit e1f0c56f74593d3781bfa4ee4871a5efbabe303c)
2020-03-23 17:35:15 -07:00
Aaron Huang
e6b0b28e6f Merge "API review: access field by method" into rvc-dev am: 854250037c
Change-Id: Ib4d6c3a3b95d8a51f5cd6202c78a4fd0c59865d7
2020-03-20 11:24:33 +00:00
Junyu Lai
da17aec65b Merge "Create a builder for NetworkCapabilities." into rvc-dev am: 448b243f52
Change-Id: Ia89d44bcc81b16198d2d653572c451143d208a94
2020-03-20 11:23:41 +00:00
Junyu Lai
da13552b40 Merge "Expose netId by adding getter API" into rvc-dev am: 21da2b6432
Change-Id: I169aabae9037f8d16fdd9e70166794173ae3c995
2020-03-20 11:23:03 +00:00
Aaron Huang
ed8b4a081a API review: access field by method am: c3e9562525
Change-Id: I7b5585b12cc8f6af23831df4aec92813ad9dcce7
2020-03-20 11:22:20 +00:00
Aaron Huang
854250037c Merge "API review: access field by method" into rvc-dev 2020-03-20 11:09:43 +00:00
Chalard Jean
cfff43c1bb Create a builder for NetworkCapabilities. am: dfcbc07b3e
Change-Id: Ifbc4fae6c55abfb5aa233cf9bc57f5e14f9b583c
2020-03-20 11:08:59 +00:00
Junyu Lai
448b243f52 Merge "Create a builder for NetworkCapabilities." into rvc-dev 2020-03-20 11:03:47 +00:00
Junyu Lai
21da2b6432 Merge "Expose netId by adding getter API" into rvc-dev 2020-03-20 11:03:05 +00:00
Lorenzo Colitti
74ff1e888c [automerger skipped] Merge "Make Ethernet interfaces more testable." into rvc-dev am: 7f11f2d84f -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 8687436656 is in history

Change-Id: I965e52fdc07ba09ad60beb3eee24a0b2d53065c0
2020-03-19 14:45:07 +00:00
Lorenzo Colitti
8975502a49 Make Ethernet interfaces more testable. am: 8687436656
Change-Id: I4b8093f656a2286e48018e29c3d33e23d875742f
2020-03-19 14:44:04 +00:00
Lorenzo Colitti
7f11f2d84f Merge "Make Ethernet interfaces more testable." into rvc-dev 2020-03-19 14:31:57 +00:00
TreeHugger Robot
56ff9e7969 Merge "Move NetworkCallback to last parameter for new exposed requestNetwork" into rvc-dev am: b6c84e985d
Change-Id: Iec20a7faa193e881193dbb5617f112f9dda5a8d8
2020-03-19 13:52:03 +00:00
TreeHugger Robot
b6c84e985d Merge "Move NetworkCallback to last parameter for new exposed requestNetwork" into rvc-dev 2020-03-19 13:40:51 +00:00
Chalard Jean
dfcbc07b3e Create a builder for NetworkCapabilities.
Bug: 151322799
Test: FrameworksWifiTests
Change-Id: I06eb97e50d5583579b3c26d1365d2dbaec8bfc99
2020-03-19 21:55:57 +09:00
Lorenzo Colitti
8687436656 Make Ethernet interfaces more testable.
This CL adds a setIncludeTestInterfaces method to EthernetManager
that, when called, causes the Ethernet service to recognize and
manage test interfaces created by TestNetworkManager.

Bug: 150644681
Test: Tested by EthernetTetheringTest in same topic
Change-Id: I86eef7a93267f800dbfc8eafd307effa76a344ca
Merged-In: I86eef7a93267f800dbfc8eafd307effa76a344ca
(cherry picked from commit 3410fb0aa92bbd4f9d7dc031e89f6f528ff34245)
2020-03-19 12:30:39 +00:00
Mark Chien
d68910e42b Merge "TetheringManager API clean up" into rvc-dev am: 3da1e71044
Change-Id: I57808f2f1fd904e81f8c8f9c2c7254255f335acd
2020-03-19 12:07:10 +00:00
Mark Chien
3da1e71044 Merge "TetheringManager API clean up" into rvc-dev 2020-03-19 12:04:05 +00:00
markchien
0fe1140651 Move NetworkCallback to last parameter for new exposed requestNetwork
Bug: 151243698
Test: atest TetheringTests
Change-Id: I87ef1d451eefa6998b9793c4eacabae978376d24
2020-03-19 19:10:23 +08:00
Paul Hu
2800cd6ce8 Merge "Kill ConnectivityManager.CONNECTIVITY_ACTION_SUPL" into rvc-dev am: b1b08a0d45
Change-Id: Ia167028fdfe4e8ce8ea2a32d486fa7ba92f74198
2020-03-19 10:21:21 +00:00
markchien
68b6784942 TetheringManager API clean up
Per API review:
- @IntDef defined on the type integer parameter
- have getters on each parameter that is set in the
  TetheringRequest.Builder
- new added API should not be deprecated
Below APIs is moved from system-current to module-lib-current that only
plafrom code(e.g. ConnectivityManager and Settings) can use them.
TetheringRequest.
onTetherableInterfaceRegexpsChanged, TetheringInterfaceRegexps:
Only platform code can use them because interfaces by regular
expressions are a mechanism which is planning to be deprecated.

Also rename some constants for easier to understand.

Bug: 149858697
Bug: 151243337
Test: m doc-comment-check-docs
      atest TetheringTests
Change-Id: Idd041f0fbeca411ea23e49786a50dd7feb77ef45
2020-03-19 16:32:37 +08:00
markchien
d069cf9367 Expose netId by adding getter API
Bug: 151156820
Test: m
      atest TetetheringTests
Change-Id: Ieb1483c146aa2f7d8f251157e6e81d71c44ae899
(cherry picked from commit 8831c4b54178753013d568c0b76bbf7487db8122)
2020-03-19 15:57:31 +09:00
Automerger Merge Worker
b5255d439e Kill ConnectivityManager.CONNECTIVITY_ACTION_SUPL
CONNECTIVITY_ACTION_SUPL is marked as a "temporary hack" and has
never been public. Remove this intent definition since no one is
receiving this intent and should use network callback to know the
connection change.

Bug: 109636544
Test: atest FrameworksNetTests
Change-Id: Ie9e5127742beba04f1c191e894e8a29fe1e704bb
Merged-In: Ie9e5127742beba04f1c191e894e8a29fe1e704bb
(cherry picked from aosp/1224697)
2020-03-19 06:53:04 +00:00
Junyu Lai
b423f917cf Merge changes I7eaca623,Ic94da540,If330e853,Ie2d229be,Ic6b2f10f into rvc-dev am: 7d06b09387
Change-Id: If7ab6d44f5289726fd90d26229807e989e7ab50a
2020-03-19 06:37:17 +00:00
junyulai
0ca4644389 [SM07] Make combine subtype configurable from Settings am: 8c526ea1bf
Change-Id: I7d4c29f713b56201c1407d51087a74043816f60f
2020-03-19 06:37:13 +00:00
junyulai
7ad17a73ab [SM05] Enable record mobile network stats by collapsed rat type am: 6d3c4ef6ee
Change-Id: I17067d7a3b2760afd7a164bc0735a858e3a91491
2020-03-19 06:37:10 +00:00
Junyu Lai
7d06b09387 Merge changes I7eaca623,Ic94da540,If330e853,Ie2d229be,Ic6b2f10f into rvc-dev
* changes:
  [SM08] Add NetworkTemplate unit test for fetching mobile data usage
  [SM07] Make combine subtype configurable from Settings
  [SM05] Enable record mobile network stats by collapsed rat type
  [SM04] Support fetching data with NetworkTemplate with subType
  [SM02] Support record mobile network stats by collapsed rat type
2020-03-19 06:29:38 +00:00
Aaron Huang
c3e9562525 API review: access field by method
- InvalidPacketException, public field should be a method so
  add getter to get error code.
- KeepalivePacketData, public fields should be methods so
   add getter for fields.

Bug: 151322799
Test: atest FrameworksNetTests
      atest FrameworksWifiTests
      atest FrameworksTelephonyTests: some failure in CarrierAppUtilsTest
Change-Id: Id01e6135193716cc21bba11da529bf1507a954f7
2020-03-19 11:38:24 +08:00