Junyu Lai
cf73cd2f67
Merge changes from topic "sp26-networkstats-cts" am: e71d3cf971 am: 8ea70c1969
...
Change-Id: Icd22765bf76b3b37935928169722afed65469105
2020-04-02 02:41:02 +00:00
junyulai
f66f5151db
[SP26.2] add a method in NetworkStats that removes empty entries am: 1052557f33 am: 378271190c
...
Change-Id: I99eef67c05afb7d6432d5dbf32494d2f5b56b1a5
2020-04-02 02:41:00 +00:00
Junyu Lai
8ea70c1969
Merge changes from topic "sp26-networkstats-cts" am: e71d3cf971
...
Change-Id: I124f0def6fdaad8f1726df23edc87b6aa7856586
2020-04-02 02:21:26 +00:00
junyulai
378271190c
[SP26.2] add a method in NetworkStats that removes empty entries am: 1052557f33
...
Change-Id: Ieee0896672625f3bab9ec02a5efa495a9d1f001b
2020-04-02 02:21:20 +00:00
Junyu Lai
e71d3cf971
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
junyulai
1052557f33
[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
junyulai
e47c7e42e5
[SP26] add CTS for NetworkStats
...
Test: atest NetworkStatsApiTest
Test: atest CtsNetTestCasesLatestSdk:NetworkStatsApiTest on Q device
Bug: 150644692
Change-Id: I690704b43cfd16de70c4c83916f6d750cf613f67
2020-04-01 16:46:08 +08:00
Aaron Huang
c33f766a4b
Merge changes from topics "networkagent_api", "networkprovider_api" am: f210e24871 am: 72b40b49e0
...
Change-Id: I94103f998bf4648ca5678f1c5f8e8ac3a27668d5
2020-04-01 05:58:42 +00:00
Chalard Jean
426ae9ae3e
Update NetworkAgentConfig API for council comments am: aea539a13e am: 1b2a71f06d
...
Change-Id: Ibbf9c6b33189bd91f6602344eaa0d455e4628977
2020-04-01 05:58:40 +00:00
Chalard Jean
e5c7b82daf
Update the NetworkAgent API for council comments am: f5d1bfd77f am: 4bc45aba0a
...
Change-Id: Ic462bc2884a4d8196bec3c997fa01063786553ab
2020-04-01 05:58:37 +00:00
Aaron Huang
72b40b49e0
Merge changes from topics "networkagent_api", "networkprovider_api" am: f210e24871
...
Change-Id: I553a53bc4612fc367591738d9669e354730fdacc
2020-04-01 05:47:04 +00:00
Chalard Jean
1b2a71f06d
Update NetworkAgentConfig API for council comments am: aea539a13e
...
Change-Id: I195c50ee1db2dd26b7c06f4ecbd6dbccc38895ef
2020-04-01 05:46:58 +00:00
Chalard Jean
4bc45aba0a
Update the NetworkAgent API for council comments am: f5d1bfd77f
...
Change-Id: I1337011740d2c34f886a6d2975bd3da24f371bb8
2020-04-01 05:46:50 +00:00
Aaron Huang
f210e24871
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
168e31bd6f
Merge "Update CS helper for clearing NetworkCapabilities UIDs." am: 28ce6a8970 am: 2ecef3416b
...
Change-Id: Ia0658afeaa207b90ae66b1a9ba708de9f837f7bd
2020-03-31 20:45:25 +00:00
Cody Kesting
ce64e241f0
Merge "Simplify unregister logic for Connectivity Diagnostics callbacks." am: bf4f1d9e98 am: b51ef5b7d7
...
Change-Id: Iaed3a58dbac1ad9af72a98d520fe80decf5d6ff6
2020-03-31 20:45:16 +00:00
Cody Kesting
2ecef3416b
Merge "Update CS helper for clearing NetworkCapabilities UIDs." am: 28ce6a8970
...
Change-Id: I6769788d7c0fade7bcab912c6a68f91161b25992
2020-03-31 20:33:17 +00:00
Cody Kesting
b51ef5b7d7
Merge "Simplify unregister logic for Connectivity Diagnostics callbacks." am: bf4f1d9e98
...
Change-Id: I798827a3505f460a5baf633ee2d3fb2422d65137
2020-03-31 20:32:59 +00:00
Cody Kesting
28ce6a8970
Merge "Update CS helper for clearing NetworkCapabilities UIDs."
2020-03-31 20:18:17 +00:00
Cody Kesting
bf4f1d9e98
Merge "Simplify unregister logic for Connectivity Diagnostics callbacks."
2020-03-31 20:18:01 +00:00
Cody Kesting
d938597099
Merge "Clarify comments for Connectivity Diagnostics reports." am: 87ce14f328 am: 1d99c7333f
...
Change-Id: Iebf142364062115dc0272bbb98a74ce4a5e8e98a
2020-03-31 18:17:26 +00:00
Cody Kesting
76735b967c
Merge "Sort administrator UIDs for NetworkCapabilities." am: c350963548 am: 8d84479831
...
Change-Id: I9232fddcc25e3cecdeb594729c7446434befd03b
2020-03-31 18:17:06 +00:00
Cody Kesting
afa1c97490
Merge "Add combine() and equals() for NetworkCapabilities admin UIDs." am: e4df39ba4b am: e0463c56eb
...
Change-Id: I20b4addc5bc60b53bd1c857a803ab30b2ed8c004
2020-03-31 18:16:36 +00:00
Cody Kesting
1d99c7333f
Merge "Clarify comments for Connectivity Diagnostics reports." am: 87ce14f328
...
Change-Id: If353d65d28842c6eb621a8881e9279a018fa9ffa
2020-03-31 18:02:08 +00:00
Cody Kesting
8d84479831
Merge "Sort administrator UIDs for NetworkCapabilities." am: c350963548
...
Change-Id: I4cfb80b1eb9edc5ad90a1aff957a0f6d1f3eb522
2020-03-31 18:01:47 +00:00
Cody Kesting
e0463c56eb
Merge "Add combine() and equals() for NetworkCapabilities admin UIDs." am: e4df39ba4b
...
Change-Id: Ic8b353d233eda759100952e126d77e9dd48005e5
2020-03-31 18:01:24 +00:00
Cody Kesting
87ce14f328
Merge "Clarify comments for Connectivity Diagnostics reports."
2020-03-31 17:43:44 +00:00
Cody Kesting
c350963548
Merge "Sort administrator UIDs for NetworkCapabilities."
2020-03-31 17:43:02 +00:00
Cody Kesting
e4df39ba4b
Merge "Add combine() and equals() for NetworkCapabilities admin UIDs."
2020-03-31 17:42:18 +00:00
Cody Kesting
f052339527
Merge "Use IBinder as key for ConnectivityDiagnostics storage in CS." am: 852715df47 am: 8426b0a531
...
Change-Id: I4faef718c72caab9c48eaaacc1704d0f4c7f2c30
2020-03-31 17:35:10 +00:00
Cody Kesting
8426b0a531
Merge "Use IBinder as key for ConnectivityDiagnostics storage in CS." am: 852715df47
...
Change-Id: Ife76fa15b2dab71021251846aa69e9090f809941
2020-03-31 17:10:51 +00:00
Cody Kesting
852715df47
Merge "Use IBinder as key for ConnectivityDiagnostics storage in CS."
2020-03-31 17:00:03 +00:00
Chalard Jean
5f12f81206
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
aea539a13e
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
f5d1bfd77f
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
022c57f6fa
Merge "Make VpnProfile.maxMtu default value match Ikev2VpnProfile" am: 0943dac366 am: 538a86d63e
...
Change-Id: I6d6cfe77ad2e0aba9437f730f5f6a176d0c54699
2020-03-31 02:51:16 +00:00
Benedict Wong
538a86d63e
Merge "Make VpnProfile.maxMtu default value match Ikev2VpnProfile" am: 0943dac366
...
Change-Id: I525f947ce90d44c286a61d05297dd205e706a319
2020-03-31 02:37:52 +00:00
Benedict Wong
0943dac366
Merge "Make VpnProfile.maxMtu default value match Ikev2VpnProfile"
2020-03-31 02:22:54 +00:00
Cody Kesting
89031bc74c
Merge "Decrement networkRequestPerUid when callbacks are unregistered." am: dcf92c32c6 am: 21f7dba1e1
...
Change-Id: Iab77f83a544c2e0b6729f84c16cfd57f7f98dc64
2020-03-31 00:52:29 +00:00
Cody Kesting
ea729736d1
Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics." am: a365c81bfa am: 7439991aec
...
Change-Id: I977106391a0723c2c105cd592ef67b6bf240abed
2020-03-31 00:51:43 +00:00
Cody Kesting
b1cd3ebfea
Update CS helper for clearing NetworkCapabilities UIDs.
...
NetworkCapabilities needs to have its UIDs cleared (UID ranges, owner
UID, and administrator UIDs) before it can be shared with apps via
ConnectivityDiagnosticsCallback invocations. The previous helper used
for clearing these values mutated the provided NetworkCapabilities. This
is updated to instead return a sanitized copy of the provided
NetworkCapabilities
Bug: 148942124
Test: atest FrameworksNetTests
Change-Id: I2431a6d273d0d73432919baf41b4f66397f4b7dc
2020-03-30 17:40:49 -07:00
Cody Kesting
21f7dba1e1
Merge "Decrement networkRequestPerUid when callbacks are unregistered." am: dcf92c32c6
...
Change-Id: I1ac0276aa434748dbb22b82f0c4aca917875b168
2020-03-31 00:26:01 +00:00
Cody Kesting
7439991aec
Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics." am: a365c81bfa
...
Change-Id: I2d3e6be0923ec2a0d3197f71fb2d3149c40a5eea
2020-03-31 00:25:24 +00:00
Cody Kesting
dcf92c32c6
Merge "Decrement networkRequestPerUid when callbacks are unregistered."
2020-03-31 00:07:01 +00:00
Cody Kesting
a365c81bfa
Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics."
2020-03-31 00:06:26 +00:00
Cody Kesting
6b74605335
Merge "Clean up handling of NetworkCapabilities#administratorUids." am: eb0b80c9e5 am: 2ea7a457b0
...
Change-Id: I136e69cd6e1e64b93eed339efe92c38817cf2d00
2020-03-30 22:50:52 +00:00
Cody Kesting
2ea7a457b0
Merge "Clean up handling of NetworkCapabilities#administratorUids." am: eb0b80c9e5
...
Change-Id: I69f1061972af362560a274084c94428b57bd46e8
2020-03-30 22:27:30 +00:00
Cody Kesting
eb0b80c9e5
Merge "Clean up handling of NetworkCapabilities#administratorUids."
2020-03-30 22:04:43 +00:00
Cody Kesting
2b1a61cf4b
Simplify unregister logic for Connectivity Diagnostics callbacks.
...
ConnectivityService is updated to simplify the logic for unregistering
ConnectivityDiagnosticsCallback instances. This change removes the given
callback from ConnectivityService's data structure. If the callback was
not registered with ConnectivityService, it is logged and the function
exits; else, the unregister() operation continues.
Bug: 150867635
Test: atest FrameworksNetTests
Change-Id: I9096969a1bf33da72b117f5bbc88257df805e688
2020-03-30 14:51:24 -07:00
Cody Kesting
9a4168bd3b
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