Commit graph android_packages_modules_Co.../tests/unit/java
Message SHA1
Merge history of packages/Connectivity am: 2afd0986d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14700782

BUG: 186628461
Merged-In: Ie82d0fb34bda77543e31c82660c6f315efa87f62
Change-Id: Ia7945b929573c9a5e697fb69358cd6d3c8beab00

Baligh Uddin   authored and   Remi NGUYEN VAN   commited 2021-05-24 08:21:53 +00:00
087dd90e5b
Merge changes I1de322c9,Id0983d4b into sc-dev
* changes:
  Improve IKEv2/IPsec VPN by proposing more IPsec algorithms
  Improve IKEv2/IPsec VPN by proposing more IKE algorithms

TreeHugger Robot   authored and   Android (Google) Code Review   commited 2021-05-22 05:05:51 +00:00
958fe9a51d
Improve IKEv2/IPsec VPN by proposing more IPsec algorithms
This commit allows IKEv2/IPsec VPN to propose more algorithms that
newly added in IpSecAlgorithm. Those new algorithms have stronger
security guarantees and better performances.

This commit also removes algorithm name validation because all
algorithms are URL encoded to ensure no special characters create
problems due to their use by VpnProfile for list or field delimiting
(e.g. rfc7539esp(chacha20,poly1305))

Bug: 185265778
Test: atest FrameworksNetTests, CtsNetTestCases
Test: All new algorithms are manually verified
Change-Id: I1de322c95aacc8924e95bcdbcfdbd1ec441de99c
Merged-In: I1de322c95aacc8924e95bcdbcfdbd1ec441de99c

Yan Yan   commited 2021-05-21 23:33:23 +00:00
f1ea9b302c
Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms"
Yan Yan   authored and   Gerrit Code Review   commited 2021-05-21 22:00:30 +00:00
70a118d80d
Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms"
Yan Yan   authored and   Gerrit Code Review   commited 2021-05-21 22:00:30 +00:00
5cb9e37a55
Improve IKEv2/IPsec VPN by proposing more IPsec algorithms
This commit allows IKEv2/IPsec VPN to propose more algorithms that
newly added in IpSecAlgorithm. Those new algorithms have stronger
security guarantees and better performances.

This commit also removes algorithm name validation because all
algorithms are URL encoded to ensure no special characters create
problems due to their use by VpnProfile for list or field delimiting
(e.g. rfc7539esp(chacha20,poly1305))

Bug: 185265778
Test: atest FrameworksNetTests, CtsNetTestCases
Test: All new algorithms are manually verified
Change-Id: I1de322c95aacc8924e95bcdbcfdbd1ec441de99c

Yan Yan   commited 2021-05-21 17:46:54 +00:00
86783c3711
Improve IKEv2/IPsec VPN by proposing more IPsec algorithms
This commit allows IKEv2/IPsec VPN to propose more algorithms that
newly added in IpSecAlgorithm. Those new algorithms have stronger
security guarantees and better performances.

This commit also removes algorithm name validation because all
algorithms are URL encoded to ensure no special characters create
problems due to their use by VpnProfile for list or field delimiting
(e.g. rfc7539esp(chacha20,poly1305))

Bug: 185265778
Test: atest FrameworksNetTests, CtsNetTestCases
Test: All new algorithms are manually verified
Change-Id: I1de322c95aacc8924e95bcdbcfdbd1ec441de99c

Yan Yan   commited 2021-05-21 17:46:54 +00:00
f3cf55f793
Check location permission for ConnDiags last.
This CL updates ConnectivityService to check location permissions for
ConnectivityDiagnostics callbacks last in the permission check process.
This minimizes misattribution of location access for networks that an
app is not administering.

This CL also updates ConnectivityDiagnosticsManager documentation to
clearly state that location permissions are required in order to receive
callbacks.

Bug: 187310575
Test: atest ConnectivityDiagnosticsManagerTest
Test: atest ConnectivityServiceTest
Change-Id: I2dbeddac6273e2392ccaeae51a1c7776d6d3da75
Merged-In: I2dbeddac6273e2392ccaeae51a1c7776d6d3da75
(cherry picked from commit f3d0fc49db)

Cody Kesting   commited 2021-05-21 16:22:50 +00:00
0b4be0203d
Merge "Check location permission for ConnDiags last."
Cody Kesting   authored and   Gerrit Code Review   commited 2021-05-20 21:27:46 +00:00
7f092f1f90
Merge "Check location permission for ConnDiags last."
Cody Kesting   authored and   Gerrit Code Review   commited 2021-05-20 21:27:46 +00:00
c5f9939bf3
Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2021-05-20 16:32:19 +00:00
f9d1bbb566
Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev
Les Lee   authored and   Android (Google) Code Review   commited 2021-05-20 08:55:59 +00:00
627c446560
Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev
Paul Hu   authored and   Android (Google) Code Review   commited 2021-05-20 08:45:35 +00:00
5acfe4933e
Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev
Paul Hu   authored and   Android (Google) Code Review   commited 2021-05-20 05:57:25 +00:00
740da160bc
Add more unit tests for ConnectivityManager S APIs
Ignore-AOSP-First: Avoid merge conflict
Test: atest android.net.ConnectivityManagerTest
Bug: 188657173
Change-Id: I33612650eb89486a14fcfc440ba0c357f4bb513c

Junyu Lai   commited 2021-05-19 15:34:38 +00:00
ffda3053d1
Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev
Les Lee   authored and   Android (Google) Code Review   commited 2021-05-19 14:32:29 +00:00
8a2405cb6d
Merge changes I3ba50cbd,I970ee365 into sc-dev
* changes:
  [FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
  [FUI27] Fix internal naming of notifyNetworkStatus

Junyu Lai   authored and   Android (Google) Code Review   commited 2021-05-19 12:36:03 +00:00
458a60dab5
Add metered filter for API: buildTemplateCarrier
This CL modifies NetworkTemplate#buildTemplateCarrier to force on
metered carrier network and rename to buildTemplateCarrierMetered.
This method was introduced recently and has no callers.

This method will be used in Settings and NetworkPolicyManagerService
to display and manage data usage on carrier metered networks.

Settings/NetworkPolicyManagerService will use it instead of the existing
method buildTemplateMobileAll method, which only matches metered networks.
That code will change from matching metered mobile networks to matching
metered carrier networks.

Note: The carrier metered network includes metered mobile network and
metered "merged carrier wifi network" that is a specific cerrier wifi network
which provides the same user experience as mobile.

Bug: 176396812
Test: atest -c NetworkTemplateTest
Change-Id: I7196d62bb60844458a6c4b1d94e2baccb71e15cd
Merged-In: I7196d62bb60844458a6c4b1d94e2baccb71e15cd

lesl   authored and   Les Lee   commited 2021-05-19 02:53:39 +00:00
f96f02703e
Support to query TYPE_WIFI usage with subscriberId
Previous the API ignores subscriberId when network type is WIFI.
Allow caller to call querySummaryXXXX with TYPE: WIFI
+ subscriberId: IMSI to get carrier merged wifi usage which matches the wifi
network with the given IMSI.

Bug: 176396812
Test: atest -c NetworkStatsServiceTest
Change-Id: Ia033521a24e2bb56182d74a41bb2b39710571782
Merged-In: Ia033521a24e2bb56182d74a41bb2b39710571782

lesl   authored and   Les Lee   commited 2021-05-19 02:53:16 +00:00
cf4a1b59ea
Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework"
Nikita Iashchenko   authored and   Gerrit Code Review   commited 2021-05-18 22:13:56 +00:00
1ae284330f
Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework"
Nikita Iashchenko   authored and   Gerrit Code Review   commited 2021-05-18 22:13:56 +00:00
fc41cdfd4c
Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer
PermissionMonitor register APPS_ALLOWED_ON_RESTRICTED_NETWORKS
setting observer to listen setting changed callback. Then update
or revoke permission for those apps.

Bug: 185149952
Test: atest FrameworksNetTests
Merged-In: I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520
(clean cherry-pick)

Change-Id: I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520

Paul Hu   commited 2021-05-18 14:19:56 +00:00
206157788c
Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor
Let PermissionMonitor read APPS_ALLOWED_ON_RESTRICTED_NETWORKS
setting and grant netd system permission to uids whose package
name is listed in setting.

Bug: 185149952
Test: atest FrameworksNetTests
Merged-In: I856b545c0339a262abbe9d432cfda125bc82dc12
(clean cherry-pick)

Change-Id: I856b545c0339a262abbe9d432cfda125bc82dc12

Paul Hu   commited 2021-05-18 14:16:57 +00:00
deb3f2e7a7
Merge "Support to query TYPE_WIFI usage with subscriberId"
Les Lee   authored and   Gerrit Code Review   commited 2021-05-18 13:02:07 +00:00
c0e15c5db2
Merge "Support to query TYPE_WIFI usage with subscriberId"
Les Lee   authored and   Gerrit Code Review   commited 2021-05-18 13:02:07 +00:00
ad9e8eeabd
Merge "Add metered filter for API: buildTemplateCarrier"
Les Lee   authored and   Gerrit Code Review   commited 2021-05-18 13:01:38 +00:00
e14af82411
Merge "Add metered filter for API: buildTemplateCarrier"
Les Lee   authored and   Gerrit Code Review   commited 2021-05-18 13:01:38 +00:00
4c7cc726d1
Allow unprivileged NetworkCallbacks to see other UIDs' networks.
Currently, unprivileged apps can call getAllNetworks() to see
all networks on the system, even networks that do not apply to
them. Allow them to do this via NetworkCallbacks as well.

This is the last piece of information that was only available
through getAllNetworks, so this CL deprecates that API.

Bug: 187921303
Test: new unit tests
Test: CTS test in other CL in topic
Change-Id: I30f1021927d3c8eae6525116c61ff4a4acecff6d

Lorenzo Colitti   commited 2021-05-18 12:24:07 +09:00
86714b1fd2
Check location permission for ConnDiags last.
This CL updates ConnectivityService to check location permissions for
ConnectivityDiagnostics callbacks last in the permission check process.
This minimizes misattribution of location access for networks that an
app is not administering.

This CL also updates ConnectivityDiagnosticsManager documentation to
clearly state that location permissions are required in order to receive
callbacks.

Bug: 187310575
Test: atest ConnectivityDiagnosticsManagerTest
Test: atest ConnectivityServiceTest
Change-Id: I2dbeddac6273e2392ccaeae51a1c7776d6d3da75

Cody Kesting   commited 2021-05-17 19:36:47 -07:00
160ef3936a
Check location permission for ConnDiags last.
This CL updates ConnectivityService to check location permissions for
ConnectivityDiagnostics callbacks last in the permission check process.
This minimizes misattribution of location access for networks that an
app is not administering.

This CL also updates ConnectivityDiagnosticsManager documentation to
clearly state that location permissions are required in order to receive
callbacks.

Bug: 187310575
Test: atest ConnectivityDiagnosticsManagerTest
Test: atest ConnectivityServiceTest
Change-Id: I2dbeddac6273e2392ccaeae51a1c7776d6d3da75

Cody Kesting   commited 2021-05-17 19:36:47 -07:00
8533f883c2
Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer"
Paul Hu   authored and   Gerrit Code Review   commited 2021-05-17 06:45:52 +00:00
ca98d3d814
Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer"
Paul Hu   authored and   Gerrit Code Review   commited 2021-05-17 06:45:52 +00:00
43864e564b
[FUI27] Fix internal naming of notifyNetworkStatus
Test: TH
Bug: 174123988
Merged-In: I970ee365ca221956ee85788005d331374b5fa71a
Change-Id: I970ee365ca221956ee85788005d331374b5fa71a
  (cherry-picked from aosp/1620539)

junyulai   commited 2021-05-17 14:07:00 +08:00
6322aeb7f0
Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor"
Paul Hu   authored and   Gerrit Code Review   commited 2021-05-17 03:04:59 +00:00
0576511565
Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor"
Paul Hu   authored and   Gerrit Code Review   commited 2021-05-17 03:04:59 +00:00
8665f56ca1
Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer
PermissionMonitor register APPS_ALLOWED_ON_RESTRICTED_NETWORKS
setting observer to listen setting changed callback. Then update
or revoke permission for those apps.

Bug: 185149952
Test: atest FrameworksNetTests
Change-Id: I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520

paulhu   authored and   Paul Hu   commited 2021-05-16 15:52:36 +00:00
85b4bec5b3
Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer
PermissionMonitor register APPS_ALLOWED_ON_RESTRICTED_NETWORKS
setting observer to listen setting changed callback. Then update
or revoke permission for those apps.

Bug: 185149952
Test: atest FrameworksNetTests
Change-Id: I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520

paulhu   authored and   Paul Hu   commited 2021-05-16 15:52:36 +00:00
f11da7e205
Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor
Let PermissionMonitor read APPS_ALLOWED_ON_RESTRICTED_NETWORKS
setting and grant netd system permission to uids whose package
name is listed in setting.

Bug: 185149952
Test: atest FrameworksNetTests
Change-Id: I856b545c0339a262abbe9d432cfda125bc82dc12

paulhu   commited 2021-05-16 23:48:55 +08:00
4f18561e9c
Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor
Let PermissionMonitor read APPS_ALLOWED_ON_RESTRICTED_NETWORKS
setting and grant netd system permission to uids whose package
name is listed in setting.

Bug: 185149952
Test: atest FrameworksNetTests
Change-Id: I856b545c0339a262abbe9d432cfda125bc82dc12

paulhu   commited 2021-05-16 23:48:55 +08:00
a7b9535fde
Support to query TYPE_WIFI usage with subscriberId
Previous the API ignores subscriberId when network type is WIFI.
Allow caller to call querySummaryXXXX with TYPE: WIFI
+ subscriberId: IMSI to get carrier merged wifi usage which matches the wifi
network with the given IMSI.

Bug: 176396812
Test: atest -c NetworkStatsServiceTest
Change-Id: Ia033521a24e2bb56182d74a41bb2b39710571782

lesl   authored and   Les Lee   commited 2021-05-16 22:18:32 +08:00
c22e8b8413
Support to query TYPE_WIFI usage with subscriberId
Previous the API ignores subscriberId when network type is WIFI.
Allow caller to call querySummaryXXXX with TYPE: WIFI
+ subscriberId: IMSI to get carrier merged wifi usage which matches the wifi
network with the given IMSI.

Bug: 176396812
Test: atest -c NetworkStatsServiceTest
Change-Id: Ia033521a24e2bb56182d74a41bb2b39710571782

lesl   authored and   Les Lee   commited 2021-05-16 22:18:32 +08:00
614551c3b6
Merge changes I3ba50cbd,I970ee365
* changes:
  [FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
  [FUI27] Fix internal naming of notifyNetworkStatus

Junyu Lai   authored and   Gerrit Code Review   commited 2021-05-15 16:21:38 +00:00
65b4d74237
Merge changes I3ba50cbd,I970ee365
* changes:
  [FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
  [FUI27] Fix internal naming of notifyNetworkStatus

Junyu Lai   authored and   Gerrit Code Review   commited 2021-05-15 16:21:38 +00:00
2a7ab18c0b
Merge "QOS filter matching support based on remote address and port number for connected sockets" am: 6c5553aaaa am: f84276bde1 am: 9896622bd3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: I04ada71bdea2c3851fd6925126f6ff2bfdecad2c

Jayachandran Chinnakkannu   authored and   Automerger Merge Worker   commited 2021-05-14 21:19:17 +00:00
65a0e0d0e5
Merge "QOS filter matching support based on remote address and port number for connected sockets"
Jayachandran Chinnakkannu   authored and   Gerrit Code Review   commited 2021-05-14 20:02:30 +00:00
02dabf7bb6
Merge "QOS filter matching support based on remote address and port number for connected sockets"
Jayachandran Chinnakkannu   authored and   Gerrit Code Review   commited 2021-05-14 20:02:30 +00:00
6c5553aaaa
Merge "[FUI26] Address comments on aosp/1560408" am: 8f03f1e788 am: e5929c073c am: 13bcaf5446
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845

Change-Id: I8c62d218953027ee2fb5426ddacae5a6f8bb6c73

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-05-14 12:20:10 +00:00
3239a62913
[FUI27] Fix internal naming of notifyNetworkStatus
Test: TH
Bug: 174123988
Change-Id: I970ee365ca221956ee85788005d331374b5fa71a

junyulai   commited 2021-05-14 19:48:17 +08:00
1df306006e
[FUI27] Fix internal naming of notifyNetworkStatus
Test: TH
Bug: 174123988
Change-Id: I970ee365ca221956ee85788005d331374b5fa71a

junyulai   commited 2021-05-14 19:48:17 +08:00
07f3432fab
[FUI26] Address comments on aosp/1560408
Test: TH
Bug: 174123988
Change-Id: I949eeb8903e903d8ede90521442b1f917d5cdfeb

junyulai   commited 2021-05-14 15:57:44 +08:00
369be87265