Commit Graph

1186 Commits

Author SHA1 Message Date
Baligh Uddin
d4e37ded44 Merge "Add OWNERS block for migration" am: 3dcbcae839 am: ff4dd6912d am: 4b0c629932
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715476

Change-Id: I8bc8d16e7a6cf0b5a032fc2ea42d6f93cd3d77f2
2021-05-22 05:03:42 +00:00
TreeHugger Robot
46fa3c96f7 [automerger skipped] Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34bbe -s ours am: ff7a480258 -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: I4c1088a626cb0c8d0dd17ddbac6ff47ffee20b1c
2021-05-22 05:03:32 +00:00
TreeHugger Robot
a3c9576a41 [automerger skipped] Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f -s ours am: aa08179040 -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: If57b7100cea33ca4eadf67ab61be146125bd77a0
2021-05-22 05:03:23 +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
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
7915a8e189 Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms" am: 5cb9e37a55 am: 10f4456e79 am: 80ddfb47cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690265

Change-Id: Id1dc3b15c495b5ab2a3578286bdb6ad57f647a29
2021-05-21 23:13:32 +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
Orion Hodson
f8a3b98311 [automerger skipped] Merge "Move to renamed NDK symbol AFileDescriptor_getFd" am: 544989351f am: 0def2a4e91 -s ours am: a2e59b47ef -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: Idaaf679a334cac51c220f9b5222e41671d087416
2021-05-21 09:31:13 +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
7300467264 Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" am: 32bd81d88b am: 38b86a2c15 am: ca34df0a6a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712731

Change-Id: Ib3005e70fd2f70a9ba591157c9ac9edd4642ddae
2021-05-21 04:39:50 +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
7fe027621a Merge "Use CS identity to update setting while performing factory reset" am: 049dbc5697 am: ab42076b53 am: 6eeaa90005
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695309

Change-Id: I97ea36e551d4445475e8edce1a752d380fd03bee
2021-05-21 02:26:17 +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
9fab646600 Merge "Check location permission for ConnDiags last." am: c5f9939bf3 am: 7cc1a8b2e7 am: 31cee3ca28
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699069

Change-Id: I7751b1327f63aa49cdf413b3c1b03555551381bf
2021-05-20 22:36:11 +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
023cd951a2 Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev am: f9d1bbb566 am: 57c89d0810
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640282

Change-Id: I3a6c01a5879910bb7e323d146d097f94e6d521a6
2021-05-20 17:13:55 +00:00
TreeHugger Robot
2e0aae9f9f Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev am: f9d1bbb566 am: a65a21d80c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640282

Change-Id: I738f01bf04af315b5c3bb4b4950b3a25a4e96c32
2021-05-20 17:08:20 +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
a65a21d80c 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: I4e3842ae2fa38b3979171ab0b48a94867040a876
2021-05-20 16:45:36 +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
495e306e84 [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 627c446560 am: d076719b77 -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 cf4a1b59ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622496

Change-Id: Ia29b8d3dd8131762bcbbb7e8e075e2fe3d3bbbe9
2021-05-20 09:15:47 +00:00
Paul Hu
7c332b6efe [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 5acfe4933e am: 3fff18a1c8 -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 206157788c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622493

Change-Id: Iecfef7bbe38e118e52f53de07d653ec5497b0b56
2021-05-20 09:15:39 +00:00
Les Lee
d076719b77 Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 627c446560
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622496

Change-Id: Ic4c5fc6e7fa3b78e52c529b597ca36a5390472e2
2021-05-20 09:11:41 +00:00
Paul Hu
3fff18a1c8 Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 5acfe4933e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622493

Change-Id: Ie9e62c30eea19718b96314b9f4bb4def8e9110c2
2021-05-20 09:10:47 +00:00
Les Lee
a3be01c3df [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 627c446560 -s ours am: 52a0b90b3b -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: I2a22974515aa4a66cdc7a479540276c823acb30b
2021-05-20 09:10:18 +00:00
Paul Hu
5f53a5bceb [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 5acfe4933e -s ours am: 43e93688f4 -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: Ia7084a9812ecb1686a83237a375bd09aeb1176cf
2021-05-20 09:10:10 +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
291558271c [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: 740da160bc -s ours am: 5960879317 -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 deb3f2e7a7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622492

Change-Id: I749d7beefd63cd99538ddd61f8abff52d7704323
2021-05-20 06:20:51 +00:00