Commit Graph

4968 Commits

Author SHA1 Message Date
Treehugger Robot
3e33a9cb60 Merge "Fix a stupid NPE" am: 72746119bc am: 77ccd8d055
Change-Id: Ic3b10be1bec50271470dfedfa8cb7f8e5ab8f821
2020-04-07 06:19:00 +00:00
Treehugger Robot
72746119bc Merge "Fix a stupid NPE" 2020-04-07 05:53:10 +00:00
Chalard Jean
19ba0bbf1b Merge "Fix a bug where the legacy extra info is reset on connect." am: 67370a01cb am: a5f7fcacbe
Change-Id: Ifa0b2239ccd0c09708085ee68c39454e1eceeffe
2020-04-06 06:34:58 +00:00
Chalard Jean
90ef10894c Fix a bug where the legacy extra info is reset on connect.
Bug: 149459996
Test: NetworkAgentTest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I5f8f6d962ee3317e101d19518c767b3c327c0c47
2020-04-06 12:46:19 +09:00
Chalard Jean
1c48f85a21 Fix a stupid NPE
Okay so this is really not a behavior change as it converts an
NPE into an illegal argument exception, but still, that's what
should happen (and that's what the upcoming test actually tests
for).

Test: upcoming NetworkAgentTest
Bug: 139268426
Change-Id: I3e17211c03bc74426bf5e2e414ec322d73b0060b
2020-04-03 07:17:13 +09:00
Chalard Jean
579665d652 Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 90c292b13e am: 3dcfc3e5c6
Change-Id: I237ed648bf6f8533e6c8e79dc44a8240c0e32e7a
2020-04-02 06:38:02 +00:00
Chalard Jean
e49cc246e8 Address further API council comments. am: 47ce6894cc am: 150ebad774
Change-Id: I8c9fa0413e3c62180eae20951e559b69e53ea049
2020-04-02 06:37:56 +00:00
Chalard Jean
150ebad774 Address further API council comments. am: 47ce6894cc
Change-Id: I237fc6a82df362d5463e8e518967de28735bf2da
2020-04-02 06:14:55 +00:00
Chalard Jean
90c292b13e Merge changes from topics "api-fix-networkagent", "satisfiedby"
* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.
2020-04-02 05:51:02 +00:00
Lorenzo Colitti
d4b0fe443a Merge "Only apply VPN isolation if it's fully routed" am: 4fa9742c4d am: 7adae30ac0
Change-Id: I76fd2c58d688ea45f9b30e9efd24235bea2eadf9
2020-04-02 04:51:36 +00:00
Lorenzo Colitti
4fa9742c4d Merge "Only apply VPN isolation if it's fully routed" 2020-04-02 04:10:12 +00:00
junyulai
1062423d8b [SP26.2] add a method in NetworkStats that removes empty entries am: fb16574069 am: 7bb7d94d39
Change-Id: I99eef67c05afb7d6432d5dbf32494d2f5b56b1a5
2020-04-02 02:41:00 +00:00
junyulai
7bb7d94d39 [SP26.2] add a method in NetworkStats that removes empty entries am: fb16574069
Change-Id: Ieee0896672625f3bab9ec02a5efa495a9d1f001b
2020-04-02 02:21:20 +00:00
Junyu Lai
6baf734a9b Merge changes from topic "sp26-networkstats-cts"
* changes:
  [SP26] add CTS for NetworkStats
  [SP26.2] add a method in NetworkStats that removes empty entries
2020-04-02 02:00:59 +00:00
Chalard Jean
3d223986a6 Rename satisfiedBy into canBeSatisfiedBy
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1
Merged-In: I076876a6662bde143ef7d315ce3767acafff93c1
2020-04-01 20:38:30 +08:00
junyulai
fb16574069 [SP26.2] add a method in NetworkStats that removes empty entries
In current design, entries with zeros are preserved after
addition/subtraction. These entries are not very useful
and lead to difficulty of verifying the result of
addition/subtraction.

However, change the behavior in the original NetworkStats
is considered risky in current stage.

Thus, this change provide a function that could remove these
empty entries in tests.

Test: atest FrameworksNetTests
Bug: 152827872
Bug: 150644692
Change-Id: I40a76935d55712b8083ee1e17e137a8a4ef5e029
2020-04-01 16:46:08 +08:00
Rubin Xu
080f217945 Only apply VPN isolation if it's fully routed
VPN is considered fully routed if both IPv4 and IPv6 have
either a default route or a prohibit route.

Bug: 145332510
Test: atest FrameworksNetTests
Change-Id: I59cf48552bca98092d1212e3d718fd420add5458
2020-04-01 09:36:29 +01:00
Chalard Jean
47ce6894cc Address further API council comments.
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Copy from ag/10866511
Change-Id: I8a785ae0e74e659c317deaaa28c203356c7766ed
Merged-In: I8a785ae0e74e659c317deaaa28c203356c7766ed
2020-04-01 16:01:04 +08:00
Aaron Huang
f23594a53a Merge changes from topics "networkagent_api", "networkprovider_api" am: e99aa91e87 am: b71c5cc720
Change-Id: I94103f998bf4648ca5678f1c5f8e8ac3a27668d5
2020-04-01 05:58:42 +00:00
Chalard Jean
b5458a152e Update NetworkAgentConfig API for council comments am: d670534507 am: d7b73dcc8f
Change-Id: Ibbf9c6b33189bd91f6602344eaa0d455e4628977
2020-04-01 05:58:40 +00:00
Chalard Jean
c54c0d8f22 Update the NetworkAgent API for council comments am: d2b02d4c1c am: 84d8e8009c
Change-Id: Ic462bc2884a4d8196bec3c997fa01063786553ab
2020-04-01 05:58:37 +00:00
Chalard Jean
d7b73dcc8f Update NetworkAgentConfig API for council comments am: d670534507
Change-Id: I195c50ee1db2dd26b7c06f4ecbd6dbccc38895ef
2020-04-01 05:46:58 +00:00
Chalard Jean
84d8e8009c Update the NetworkAgent API for council comments am: d2b02d4c1c
Change-Id: I1337011740d2c34f886a6d2975bd3da24f371bb8
2020-04-01 05:46:50 +00:00
Aaron Huang
e99aa91e87 Merge changes from topics "networkagent_api", "networkprovider_api"
* changes:
  Update the NetworkProvider API for council comments
  Update NetworkAgentConfig API for council comments
  Update the NetworkAgent API for council comments
2020-04-01 05:33:28 +00:00
Cody Kesting
0c96f1d2c9 Merge "Clarify comments for Connectivity Diagnostics reports." am: b187c3c1af am: f4301de657
Change-Id: Iebf142364062115dc0272bbb98a74ce4a5e8e98a
2020-03-31 18:17:26 +00:00
Cody Kesting
a550e5393b Merge "Sort administrator UIDs for NetworkCapabilities." am: 976f715d2e am: 39c41d3439
Change-Id: I9232fddcc25e3cecdeb594729c7446434befd03b
2020-03-31 18:17:06 +00:00
Cody Kesting
9a657efd65 Merge "Add combine() and equals() for NetworkCapabilities admin UIDs." am: 55b71cb731 am: 3e72530a42
Change-Id: I20b4addc5bc60b53bd1c857a803ab30b2ed8c004
2020-03-31 18:16:36 +00:00
Cody Kesting
b187c3c1af Merge "Clarify comments for Connectivity Diagnostics reports." 2020-03-31 17:43:44 +00:00
Cody Kesting
976f715d2e Merge "Sort administrator UIDs for NetworkCapabilities." 2020-03-31 17:43:02 +00:00
Cody Kesting
55b71cb731 Merge "Add combine() and equals() for NetworkCapabilities admin UIDs." 2020-03-31 17:42:18 +00:00
Chalard Jean
8c56272f68 Update the NetworkProvider API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Copy from ag/10826397
Change-Id: I6b086572cfc72a0727f4510351cff0e74cbc4302
Merged-In: I6b086572cfc72a0727f4510351cff0e74cbc4302
2020-03-31 11:57:59 +00:00
Chalard Jean
d670534507 Update NetworkAgentConfig API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Copy from ag/10826396
Change-Id: Idca9f243a5c955f4caa30921ee520e1a93b0d11a
Merged-In: Idca9f243a5c955f4caa30921ee520e1a93b0d11a
2020-03-31 11:51:05 +00:00
Chalard Jean
d2b02d4c1c Update the NetworkAgent API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Copy from ag/10824609
Change-Id: I9a2691f783f4449348c3f767568e05620f0b9df5
Merged-In: I9a2691f783f4449348c3f767568e05620f0b9df5
2020-03-31 11:34:42 +00:00
Benedict Wong
e311338377 Merge "Make VpnProfile.maxMtu default value match Ikev2VpnProfile" am: 328ef02bf3 am: 1ee1f86749
Change-Id: I6d6cfe77ad2e0aba9437f730f5f6a176d0c54699
2020-03-31 02:51:16 +00:00
Benedict Wong
328ef02bf3 Merge "Make VpnProfile.maxMtu default value match Ikev2VpnProfile" 2020-03-31 02:22:54 +00:00
Cody Kesting
e5389f6212 Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics." am: e4479f571f am: 778c743170
Change-Id: I977106391a0723c2c105cd592ef67b6bf240abed
2020-03-31 00:51:43 +00:00
Cody Kesting
e4479f571f Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics." 2020-03-31 00:06:26 +00:00
Cody Kesting
2fa1db5b7b Merge "Clean up handling of NetworkCapabilities#administratorUids." am: 03f3491bd4 am: 41f775f904
Change-Id: I136e69cd6e1e64b93eed339efe92c38817cf2d00
2020-03-30 22:50:52 +00:00
Cody Kesting
03f3491bd4 Merge "Clean up handling of NetworkCapabilities#administratorUids." 2020-03-30 22:04:43 +00:00
Cody Kesting
604dd40cf0 Clarify comments for Connectivity Diagnostics reports.
Clarify when
ConnectivityDiagnosticsCallback#onConnectivityReportAvailable will be
invoked. Clarify when NetworkAgentInfo#mConnectivityReport will be null
vs non-null.

Bug: 147849853
Test: atest FrameworksNetTests
Change-Id: I748bd9ded72a34d89f13bd4362d6d4da62b910b8
2020-03-30 14:51:24 -07:00
Cody Kesting
2091bd9059 Sort administrator UIDs for NetworkCapabilities.
Administrator UIDs stored in NetworkCapabilities should be sorted. This
allows for easier equals checks and hashCode computation. Additionally,
duplicate UIDs should be prevented.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: Ia5387ca2ce7c3fcbd04dc7fbff5266f7bcc71694
2020-03-30 14:51:24 -07:00
Chalard Jean
5fad8aa761 Add combine() and equals() for NetworkCapabilities admin UIDs.
NetworkCapabilities#mAdministratorUids should be checked for equality
when combining NetworkCapabilities. Administrator UIDs should also be
included in NetworkCapabilities equals() and hashCode().

Bug: 147903575
Test: FrameworksNetTests
Change-Id: I803bdec80e27ee80d3a39844c5fb7aed584ab07d
2020-03-30 14:27:20 -07:00
Cody Kesting
95ec0b206b Invoke onConnectivityReport on registering ConnectivityDiagnostics.
This change updates the behavior for registering
ConnectivityDiagnosticsCallbacks. Now, after a successful register()
call, callbacks will receive cached ConnectivityReports for all
matching, permissioned networks. This allows registrants to be updated
with the network state for their networks without having to wait for the
next network validation.

Bug: 147849853
Test: atest FrameworksNetTests
Change-Id: I924ba8fdcc847f453557021591bde38602fe089c
2020-03-30 11:10:46 -07:00
Cody Kesting
898496365a Clean up handling of NetworkCapabilities#administratorUids.
Update ConnectivityService's check for administrator UIDs to use
ArrayUtils to check for UID inclusion. Update the NetworkCapabilities
annotation on the administrator UIDs field to clarify that it is
NonNull.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: Id630fe9d76aacdaf038fdaa5360f0327520ee0c3
2020-03-30 16:55:21 +00:00
Remi NGUYEN VAN
10d75c7194 Merge "Create a builder for NetworkCapabilities." am: c6ab1a994f am: f6e84adc67
Change-Id: I2b7646ff87886123230699d306005377858a1c04
2020-03-30 03:15:13 +00:00
Remi NGUYEN VAN
c6ab1a994f Merge "Create a builder for NetworkCapabilities." 2020-03-30 02:58:45 +00:00
Benedict Wong
d0a44f49df Make VpnProfile.maxMtu default value match Ikev2VpnProfile
This change corrects the VpnProfile's maxMtu defaults to match that of
the Ikev2VpnProfile. 1400 is too high as a default, and Settings will
run into an issue here quite often.

Bug: 152573931
Test: FrameworksNetTests passing
Change-Id: I97ba5903b3cc1ed6a21c706ed3d78bd8ecbeee0c
2020-03-27 11:52:40 -07:00
Tobias Thierer
5bd921f8c3 Merge "OWNERS: tobiast -> ngeoffray." am: 9c0d26b4cb am: d9b0a60742
Change-Id: I34cec5528243e6655287ba020eef5abf7e2ca114
2020-03-27 11:51:27 +00:00
Tobias Thierer
9c0d26b4cb Merge "OWNERS: tobiast -> ngeoffray." 2020-03-27 11:04:12 +00:00
Aaron Huang
52b48e4cd0 Merge "API review: access field by method" am: 79c8147678 am: 1922f85403
Change-Id: I60e7f467251e2c33f62967edd1c029321eb6e369
2020-03-27 07:47:32 +00:00