TreeHugger Robot
e41bdecdb1
[automerger skipped] Merge "Check location permission for ConnDiags last." into sc-dev am: 424e2ef3aa -s ours
...
am skip reason: Merged-In I2dbeddac6273e2392ccaeae51a1c7776d6d3da75 with SHA-1 8533f883c2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14676745
Change-Id: I12bf8a6e329e7d3555dd2387419e875f05017128
2021-05-22 05:07:45 +00:00
Baligh Uddin
4b0c629932
Merge "Add OWNERS block for migration" am: 3dcbcae839 am: ff4dd6912d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715476
Change-Id: Icdab309144d7f4fa5ec1eb80efd919c66d408839
2021-05-22 05:01:43 +00:00
TreeHugger Robot
424e2ef3aa
Merge "Check location permission for ConnDiags last." into sc-dev
2021-05-22 05:01:18 +00:00
TreeHugger Robot
ff7a480258
[automerger skipped] Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34bbe -s ours
...
am skip reason: Merged-In If2dd69f702a1eafff331f9e71f6b92aeadfb715d with SHA-1 bc66712394 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674293
Change-Id: I3672d2fe9420368e76ce7e724b7d9c2b7ac26660
2021-05-22 05:00:52 +00:00
TreeHugger Robot
aa08179040
[automerger skipped] Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f -s ours
...
am skip reason: Merged-In I369e71dd6ae85da78e114ea8377967ab0bde787b with SHA-1 92346fdf33 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674291
Change-Id: Ib7f2157f4b1cf82dd7d124ac263fd9c3a61f2c7c
2021-05-22 05:00:41 +00:00
TreeHugger Robot
08bbc34bbe
Merge "Use CS identity to update setting while performing factory reset" into sc-dev
2021-05-22 04:59:28 +00:00
Baligh Uddin
ff4dd6912d
Merge "Add OWNERS block for migration" am: 3dcbcae839
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715476
Change-Id: I06e249398983790eeda9378b36f181ee459c10e1
2021-05-22 04:37:11 +00:00
Baligh Uddin
3dcbcae839
Merge "Add OWNERS block for migration"
2021-05-22 04:01:33 +00:00
Yan Yan
80ddfb47cd
Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms" am: 5cb9e37a55 am: 10f4456e79
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690265
Change-Id: I0e467627fdbf70d6ec704f1f2be58223df9642ed
2021-05-21 23:12:45 +00:00
Yan Yan
10f4456e79
Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms" am: 5cb9e37a55
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690265
Change-Id: I8b8a423b093f5a8696e43afbdac0cbb555dd4aff
2021-05-21 22:53:48 +00:00
Yan Yan
5cb9e37a55
Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms"
2021-05-21 22:00:30 +00:00
Yan Yan
f3cf55f793
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
2021-05-21 17:46:54 +00:00
Baligh Uddin
0e8ea277cd
Add OWNERS block for migration
...
BUG: 186628461
Test: TH
Change-Id: Id03e0dfbe621b8ad08e594c0f6525ad9240837ae
2021-05-21 16:33:32 +00:00
Cody Kesting
0b4be0203d
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 )
2021-05-21 16:22:50 +00:00
Orion Hodson
a2e59b47ef
[automerger skipped] Merge "Move to renamed NDK symbol AFileDescriptor_getFd" am: 544989351f am: 0def2a4e91 -s ours
...
am skip reason: Merged-In Ic13f1d9832d5ae5b6ae4b96323025d9b695fdaf9 with SHA-1 a1a2ccb8d7 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703089
Change-Id: I9a5838ea3a86a64214181135ff87d2fb52cfcddd
2021-05-21 09:07:29 +00:00
Orion Hodson
0def2a4e91
Merge "Move to renamed NDK symbol AFileDescriptor_getFd" am: 544989351f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703089
Change-Id: Ia45703aa469fcfb1efcc6b12479254e731dc794b
2021-05-21 08:46:52 +00:00
Orion Hodson
544989351f
Merge "Move to renamed NDK symbol AFileDescriptor_getFd"
2021-05-21 08:29:52 +00:00
Treehugger Robot
fac2a72593
Use CS identity to update setting while performing factory reset
...
When apps try to call factoryReset to do networking reset, it
will result in updating the setting in SettingsProvider.
ContentProvider will verify if the package name of the caller
that initiated the request being processed on the current thread.
The package should belong to the calling UID. The setting update
started from the ConnectivityService context, so the package will
be android but the calling UID will be the calling app. It will
cause a SecurityException. The behavior is fine previously as its
known caller(Settings) shares system UID. But it will be a
problem for other callers, such as CTS. Thus, clear the identity
since the necessary permission check should be examined at the
top of the method. The following actions should be fine to be
proceed from the system itself. Also replace the user restriction
check via hasUserRestrictionForUser with the UserHandle created
from the calling uid to ensure it's verified with correct user.
Bug: 186061922
Test: Factory reset from Settings
Merged-In: If2dd69f702a1eafff331f9e71f6b92aeadfb715d
Change-Id: If2dd69f702a1eafff331f9e71f6b92aeadfb715d
(cherry picked from commit 10ba4b773b )
2021-05-21 08:01:37 +00:00
Chiachang Wang
0aa413eba7
Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities
...
Bug: 186061922
Test: atest CtsNetTestCases:android.net.NetworkCapabilitiesTest
Merged-In: I369e71dd6ae85da78e114ea8377967ab0bde787b
Change-Id: I369e71dd6ae85da78e114ea8377967ab0bde787b
(cherry picked from commit 0aa0790dec )
2021-05-21 07:54:46 +00:00
Chiachang Wang
ca34df0a6a
Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" am: 32bd81d88b am: 38b86a2c15
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712731
Change-Id: I53a692383de98d959b029cfd618621f47059fdd5
2021-05-21 04:15:37 +00:00
Chiachang Wang
38b86a2c15
Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" am: 32bd81d88b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712731
Change-Id: I6a5f4681224315c2c63cad24e0defd1abcc25330
2021-05-21 03:56:22 +00:00
Chiachang Wang
32bd81d88b
Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities"
2021-05-21 03:33:23 +00:00
Treehugger Robot
6eeaa90005
Merge "Use CS identity to update setting while performing factory reset" am: 049dbc5697 am: ab42076b53
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695309
Change-Id: I7c23d33349e7f28a6fc17f5191e973f60e1eb96d
2021-05-21 02:08:51 +00:00
Chiachang Wang
92346fdf33
Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities
...
Bug: 186061922
Test: atest CtsNetTestCases:android.net.NetworkCapabilitiesTest
Change-Id: I369e71dd6ae85da78e114ea8377967ab0bde787b
2021-05-21 09:57:42 +08:00
Treehugger Robot
ab42076b53
Merge "Use CS identity to update setting while performing factory reset" am: 049dbc5697
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695309
Change-Id: Ifce6312c750c738a4e4afb93f39522b4a282ae4a
2021-05-21 01:44:13 +00:00
Treehugger Robot
049dbc5697
Merge "Use CS identity to update setting while performing factory reset"
2021-05-21 01:26:05 +00:00
Cody Kesting
31cee3ca28
Merge "Check location permission for ConnDiags last." am: c5f9939bf3 am: 7cc1a8b2e7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699069
Change-Id: I6ca0b27d9280e9246fbf6ea105f18d6f1d073388
2021-05-20 22:18:05 +00:00
Cody Kesting
7cc1a8b2e7
Merge "Check location permission for ConnDiags last." am: c5f9939bf3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699069
Change-Id: Idfea26523ff297f8be22695dd5a4e5351a7ccda4
2021-05-20 21:46:19 +00:00
Cody Kesting
c5f9939bf3
Merge "Check location permission for ConnDiags last."
2021-05-20 21:27:46 +00:00
TreeHugger Robot
57c89d0810
Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev am: f9d1bbb566
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640282
Change-Id: I578b566c5b73e06b9f675cbde6954dccbc0a5a57
2021-05-20 16:45:48 +00:00
TreeHugger Robot
f9d1bbb566
Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev
2021-05-20 16:32:19 +00:00
Les Lee
52a0b90b3b
[automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 627c446560 -s ours
...
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 614551c3b6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622496
Change-Id: If1a3eeb5077d7b078a3be260e01c4cf3f6790437
2021-05-20 09:06:38 +00:00
Paul Hu
43e93688f4
[automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 5acfe4933e -s ours
...
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 f11da7e205 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622493
Change-Id: I2b1a734003cf71be772550bfef68f3c057d1f22f
2021-05-20 09:06:24 +00:00
Les Lee
627c446560
Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev
2021-05-20 08:55:59 +00:00
Paul Hu
5acfe4933e
Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev
2021-05-20 08:45:35 +00:00
Paul Hu
5960879317
[automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: 740da160bc -s ours
...
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 a7b9535fde is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622492
Change-Id: Idd31246804a7374929545c7a4c021058a33a9758
2021-05-20 06:02:38 +00:00
Paul Hu
740da160bc
Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev
2021-05-20 05:57:25 +00:00
TreeHugger Robot
50f787f627
Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: 6f0f141cd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670
Change-Id: Ib259c6351471aca6656dc4d46bb7242228a226c2
2021-05-20 04:21:42 +00:00
TreeHugger Robot
6f0f141cd5
Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev
2021-05-20 03:59:55 +00:00
Remi NGUYEN VAN
7e7aa6e163
Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: 4c0e93f15b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622504
Change-Id: Iee4dd439c3f98e600c6a6b1ed6a73384f9a1c2ac
2021-05-20 03:35:35 +00:00
Remi NGUYEN VAN
4c0e93f15b
Merge "Remove legacy resources fallback from Connectivity" into sc-dev
2021-05-20 03:03:16 +00:00
Chiachang Wang
bc66712394
Use CS identity to update setting while performing factory reset
...
When apps try to call factoryReset to do networking reset, it
will result in updating the setting in SettingsProvider.
ContentProvider will verify if the package name of the caller
that initiated the request being processed on the current thread.
The package should belong to the calling UID. The setting update
started from the ConnectivityService context, so the package will
be android but the calling UID will be the calling app. It will
cause a SecurityException. The behavior is fine previously as its
known caller(Settings) shares system UID. But it will be a
problem for other callers, such as CTS. Thus, clear the identity
since the necessary permission check should be examined at the
top of the method. The following actions should be fine to be
proceed from the system itself. Also replace the user restriction
check via hasUserRestrictionForUser with the UserHandle created
from the calling uid to ensure it's verified with correct user.
Bug: 186061922
Test: Factory reset from Settings
Change-Id: If2dd69f702a1eafff331f9e71f6b92aeadfb715d
2021-05-20 10:01:50 +08:00
Junyu Lai
ffda3053d1
Add more unit tests for ConnectivityManager S APIs
...
Ignore-AOSP-First: Avoid merge conflict
Test: atest android.net.ConnectivityManagerTest
Bug: 188657173
Change-Id: I33612650eb89486a14fcfc440ba0c357f4bb513c
2021-05-19 15:34:38 +00:00
Les Lee
73ffff59eb
[automerger skipped] Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: 8a2405cb6d -s ours
...
am skip reason: Merged-In I7196d62bb60844458a6c4b1d94e2baccb71e15cd with SHA-1 575b5569f6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622495
Change-Id: Ica7cf82e3d17cbe5d0577e14faa563cfbfdc9385
2021-05-19 14:48:10 +00:00
Les Lee
8a2405cb6d
Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev
2021-05-19 14:32:29 +00:00
Junyu Lai
3ce2e480ca
[automerger skipped] Merge changes I3ba50cbd,I970ee365 into sc-dev am: 458a60dab5 -s ours
...
am skip reason: Merged-In I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1 with SHA-1 5744432f28 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562500
Change-Id: Ic87d5b62ddd55ec1c264839dd84c3c375794e428
2021-05-19 12:57:00 +00:00
Junyu Lai
458a60dab5
Merge changes I3ba50cbd,I970ee365 into sc-dev
...
* changes:
[FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
[FUI27] Fix internal naming of notifyNetworkStatus
2021-05-19 12:36:03 +00:00
Junyu Lai
ed43c9e5bd
[automerger skipped] Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev am: 0dc5e2a8a2 -s ours
...
am skip reason: Merged-In I98dd3f4652dc067eb5c4666e952db6c854bcbb10 with SHA-1 9ef2350d50 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550548
Change-Id: I4bd31102915e420296d0e3566c07239cab2e0c3b
2021-05-19 12:03:01 +00:00
Junyu Lai
0dc5e2a8a2
Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev
2021-05-19 11:31:39 +00:00
junyulai
35687f5979
[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present
...
Test: atest NetworkRequestTest#testBypassingVcn
Fix: 176939355
Fix: 188597540
Merged-In: I98dd3f4652dc067eb5c4666e952db6c854bcbb10
Change-Id: I98dd3f4652dc067eb5c4666e952db6c854bcbb10
(cherry-picked from aosp/1705390)
2021-05-19 09:52:03 +00:00