Commit Graph

15049 Commits

Author SHA1 Message Date
TreeHugger Robot
065852c749 Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev am: 8276072ec9 am: b0c0b5deab
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
b0c0b5deab Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev am: 8276072ec9
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
8276072ec9 Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev 2021-05-20 16:32:19 +00:00
Les Lee
317cb30668 [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 97385fe60d am: a96e197bb6 -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 e650c5d898 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
4d58beff20 [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 92357d0683 am: d8ab25b0d1 -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 aacdca1227 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
a96e197bb6 Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 97385fe60d
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
d8ab25b0d1 Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 92357d0683
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
df13ccb4ad [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 97385fe60d -s ours am: 4b84bc4feb -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 645be7b586 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
5927b2d4ab [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 92357d0683 -s ours am: 86d9827212 -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 0d9553a5c1 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
4b84bc4feb [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 97385fe60d -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 645be7b586 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
86d9827212 [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 92357d0683 -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 0d9553a5c1 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
97385fe60d Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev 2021-05-20 08:55:59 +00:00
Paul Hu
92357d0683 Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev 2021-05-20 08:45:35 +00:00
Paul Hu
a893b4e9b9 [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: be72086fff -s ours am: 2019dcef2e -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 8ee4d96282 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
Paul Hu
c1482d200c [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: be72086fff am: 1e7021ef40 -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 5d847b19cd is already in history

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

Change-Id: I0dad8c143355a20370b36fc06e9bc6a12f4a858c
2021-05-20 06:18:39 +00:00
Paul Hu
1e7021ef40 Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: be72086fff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622492

Change-Id: I5a402f666c66f19e849b3bf2e1a7034cbfd97734
2021-05-20 06:04:22 +00:00
Paul Hu
2019dcef2e [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: be72086fff -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 5d847b19cd 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
be72086fff Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev 2021-05-20 05:57:25 +00:00
TreeHugger Robot
2f962fac5e Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: a99476773f am: 3c1aac187d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670

Change-Id: Ieefbf729ec7cca3264a5f77434ea62955d878825
2021-05-20 04:48:44 +00:00
Remi NGUYEN VAN
fa32cb1413 Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: ae18da9ebe am: 6a6e3859cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622504

Change-Id: Ifcae8b0e5ef093563e27948db6e6308a9be084a1
2021-05-20 04:47:55 +00:00
TreeHugger Robot
9cb6d7475b Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: a99476773f am: 74dddbeb82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670

Change-Id: Ib3d94471163139f281eaeff5cc67716eaffea593
2021-05-20 04:31:14 +00:00
TreeHugger Robot
74dddbeb82 Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: a99476773f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670

Change-Id: Ieb5a7a764a5b7fc327af0aeda0c2db51b6e6187c
2021-05-20 04:23:26 +00:00
TreeHugger Robot
3c1aac187d Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: a99476773f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670

Change-Id: Ib259c6351471aca6656dc4d46bb7242228a226c2
2021-05-20 04:21:42 +00:00
Remi NGUYEN VAN
db0456ce73 Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: ae18da9ebe am: 870fe3915d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622504

Change-Id: Ib7c4c68edfbb089f34a7679c2f58402fc8a816be
2021-05-20 04:21:41 +00:00
TreeHugger Robot
a99476773f Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev 2021-05-20 03:59:55 +00:00
Remi NGUYEN VAN
870fe3915d Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: ae18da9ebe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622504

Change-Id: I016f899a96b5499260b809fa999b5138d5982a72
2021-05-20 03:38:08 +00:00
Remi NGUYEN VAN
6a6e3859cf Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: ae18da9ebe
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
ae18da9ebe Merge "Remove legacy resources fallback from Connectivity" into sc-dev 2021-05-20 03:03:16 +00:00
Junyu Lai
f88708bdc0 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
ed4a75c645 [automerger skipped] Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: c95482c53d -s ours am: 76b4c2abeb -s ours
am skip reason: Merged-In I7196d62bb60844458a6c4b1d94e2baccb71e15cd with SHA-1 2ef2fa7605 is already in history

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

Change-Id: I1aca453aad83a38deb0bf56646b6e302e0945ba7
2021-05-19 15:07:50 +00:00
Les Lee
ebba55695f [automerger skipped] Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: c95482c53d am: a43c9ab9f3 -s ours
am skip reason: Merged-In I7196d62bb60844458a6c4b1d94e2baccb71e15cd with SHA-1 79ac43db9e is already in history

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

Change-Id: Ifd58def553962ce413d77ad619aaed0e7015d216
2021-05-19 15:07:34 +00:00
Les Lee
a43c9ab9f3 Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: c95482c53d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622495

Change-Id: Ic72650951d9e03c5bb3c1861f4c39aac47065357
2021-05-19 14:50:04 +00:00
Les Lee
76b4c2abeb [automerger skipped] Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: c95482c53d -s ours
am skip reason: Merged-In I7196d62bb60844458a6c4b1d94e2baccb71e15cd with SHA-1 79ac43db9e 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
c95482c53d Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev 2021-05-19 14:32:29 +00:00
Junyu Lai
a797ea252f [automerger skipped] Merge changes I3ba50cbd,I970ee365 into sc-dev am: 6ff0bbc3ac -s ours am: 4d35445f7e -s ours
am skip reason: Merged-In I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1 with SHA-1 92aff0d836 is already in history

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

Change-Id: I5ab7a94fc84840d4feaf2d558167332b7af946dd
2021-05-19 13:18:43 +00:00
Junyu Lai
4d35445f7e [automerger skipped] Merge changes I3ba50cbd,I970ee365 into sc-dev am: 6ff0bbc3ac -s ours
am skip reason: Merged-In I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1 with SHA-1 565a3085ce 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
e894e65258 [automerger skipped] Merge changes I3ba50cbd,I970ee365 into sc-dev am: 6ff0bbc3ac am: b4d07a85ad -s ours
am skip reason: Merged-In I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1 with SHA-1 565a3085ce is already in history

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

Change-Id: I7ac2b7e04408c598bc81943ea83947ee074205b2
2021-05-19 12:49:04 +00:00
junyulai
39e35ca0ce [automerger skipped] [FUI27] Fix internal naming of notifyNetworkStatus am: eb91ec2684 am: e7ed46dea4 -s ours
am skip reason: Merged-In I970ee365ca221956ee85788005d331374b5fa71a with SHA-1 5eb5fbfce3 is already in history

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

Change-Id: I79bc3a6cea4d9828f8ea1208756091bab461b72d
2021-05-19 12:49:02 +00:00
Junyu Lai
b4d07a85ad Merge changes I3ba50cbd,I970ee365 into sc-dev am: 6ff0bbc3ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562500

Change-Id: Ibd0f0edb5c9666dd32ef42168d41111f2cf24d70
2021-05-19 12:41:44 +00:00
junyulai
e7ed46dea4 [FUI27] Fix internal naming of notifyNetworkStatus am: eb91ec2684
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562499

Change-Id: I4671975978f6f07b32a7e7b4507f82600d454739
2021-05-19 12:41:40 +00:00
Junyu Lai
6ff0bbc3ac 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
3536b973ad [automerger skipped] Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev am: 7290bf7e2e -s ours am: 0b2fd00acc -s ours
am skip reason: Merged-In I98dd3f4652dc067eb5c4666e952db6c854bcbb10 with SHA-1 1ebade181e is already in history

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

Change-Id: I9ba67d909b9d76dc30c2ac9b24b697f23dc4899d
2021-05-19 12:23:17 +00:00
Junyu Lai
a4a0aa8165 [automerger skipped] Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev am: 7290bf7e2e am: 4a133d34d9 -s ours
am skip reason: Merged-In I98dd3f4652dc067eb5c4666e952db6c854bcbb10 with SHA-1 59177af317 is already in history

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

Change-Id: I5d5cee3870f8e40c7c77563548b21a8731082974
2021-05-19 12:21:12 +00:00
Junyu Lai
0b2fd00acc [automerger skipped] Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev am: 7290bf7e2e -s ours
am skip reason: Merged-In I98dd3f4652dc067eb5c4666e952db6c854bcbb10 with SHA-1 59177af317 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
7290bf7e2e 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
1ebade181e [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
Remi NGUYEN VAN
498261b15c [automerger skipped] Merge "Move config_apf* resources to NetworkStack" into sc-dev am: 66b0a0361b -s ours
am skip reason: Merged-In I7a15ddcad5af11fa307d9dbe3a77b31a1179e5b3 with SHA-1 e9836cc431 is already in history

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

Change-Id: Ic8d42beef91705149641db3f63bc1a3c0ee162f4
2021-05-19 08:11:23 +00:00
Remi NGUYEN VAN
66b0a0361b Merge "Move config_apf* resources to NetworkStack" into sc-dev 2021-05-19 07:54:19 +00:00
Remi NGUYEN VAN
4806af5218 Remove legacy resources fallback from Connectivity
Stop reading legacy resources as fallback, and only use resources in
ServiceConnectivityResources.

Bug: 185850634
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: I224f1ef9a1a8d6e636c7e9550845ab3e1394d7f3
2021-05-19 12:13:48 +09:00
Remi NGUYEN VAN
159c362b21 Merge "Move config_apf* resources to NetworkStack" am: c52f4eb2c6 am: 8f0380f066
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684656

Change-Id: I93f5fd10f6c365365ff0e89ca4221d58d420c5ac
2021-05-19 03:11:41 +00:00