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
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
Remi NGUYEN VAN
8f0380f066
Merge "Move config_apf* resources to NetworkStack" am: c52f4eb2c6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684656
Change-Id: Ie51eae491092389fbc7321491da6129c24c3de00
2021-05-19 02:37:01 +00:00
Remi NGUYEN VAN
3aee5b63e6
Move config_apf* resources to NetworkStack
...
The resources are only read by NetworkStack through their respective
ApfCapabilities SystemApi methods.
As the resources are being migrated out of frameworks/base resources
anyway, move them directly to NetworkStack instead of moving them to
ServiceConnectivityResources.
Also test that the framework resources are not overlaid or modified.
This should avoid OEM integration errors where the overlays are kept as
in R, without overlaying the resource in the NetworkStack package.
Bug: 185850634
Test: atest CtsNetTestCases
BYPASS_INCLUSIVE_LANGUAGE_REASON=Need to mention legacy APIs
Merged-In: I7a15ddcad5af11fa307d9dbe3a77b31a1179e5b3
(clean cherry-pick)
Change-Id: I7a15ddcad5af11fa307d9dbe3a77b31a1179e5b3
2021-05-19 11:00:58 +09:00
Remi NGUYEN VAN
c52f4eb2c6
Merge "Move config_apf* resources to NetworkStack"
2021-05-19 00:58:52 +00:00
Nikita Iashchenko
ecf93ebf39
Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework" am: a8eb4abf4d am: a5b968f7ca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686657
Change-Id: I08b1d281a3b71556d783b1d4f352bc7a4ba8e879
2021-05-18 23:27:10 +00:00
Nikita Iashchenko
a5b968f7ca
Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework" am: a8eb4abf4d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686657
Change-Id: I2aced35532a572f7912abde832cfdce66c34a3d0
2021-05-18 23:07:28 +00:00
Nikita Iashchenko
a8eb4abf4d
Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework"
2021-05-18 22:13:56 +00:00
Les Lee
b986c2352b
Merge "Support to query TYPE_WIFI usage with subscriberId" am: 0c461a4252 am: c890b3cfb5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608057
Change-Id: Ifeaab15fbf20b318bb7b35aa6b4604f21e2c98a1
2021-05-18 13:57:43 +00:00
Les Lee
727b2eac5b
Merge "Add metered filter for API: buildTemplateCarrier" am: bc5af1fa71 am: 71349734b7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699687
Change-Id: I46d8d8f0d9b83fb0a817a3455cbbc28d558b871c
2021-05-18 13:57:06 +00:00
Les Lee
c890b3cfb5
Merge "Support to query TYPE_WIFI usage with subscriberId" am: 0c461a4252
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608057
Change-Id: I753603201bd935af055cf25135e4f8faf436bf2a
2021-05-18 13:35:08 +00:00
Les Lee
71349734b7
Merge "Add metered filter for API: buildTemplateCarrier" am: bc5af1fa71
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699687
Change-Id: Iac42f02079de5c0507209741e648b13da667fb94
2021-05-18 13:26:24 +00:00
Les Lee
0c461a4252
Merge "Support to query TYPE_WIFI usage with subscriberId"
2021-05-18 13:02:07 +00:00
Les Lee
bc5af1fa71
Merge "Add metered filter for API: buildTemplateCarrier"
2021-05-18 13:01:38 +00:00
Chiachang Wang
69c73252a6
[automerger skipped] Merge "Dump only NORMAL priority information if no priority assigned" into sc-dev am: ad4e3bbd5b -s ours
...
am skip reason: Merged-In I6825c5038e48e3060c0c3ad1512bd584ef6d10a7 with SHA-1 987b73fbe0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14580814
Change-Id: I5f08130dfd3434960bbda59ef98784873437882a
2021-05-18 12:12:54 +00:00
Chiachang Wang
ad4e3bbd5b
Merge "Dump only NORMAL priority information if no priority assigned" into sc-dev
2021-05-18 11:57:53 +00:00
Treehugger Robot
9493879b31
Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" am: d5fbc078d1 am: 1587b248cd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705390
Change-Id: I6a009ce0b78fb684fe75cedb7fedb96a0ca9bdca
2021-05-18 09:57:20 +00:00
Treehugger Robot
1587b248cd
Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" am: d5fbc078d1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705390
Change-Id: I0d8dd61da97e675ba70fd7dd5f1e889d8a2e54f7
2021-05-18 09:36:15 +00:00
Treehugger Robot
d5fbc078d1
Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present"
2021-05-18 08:35:06 +00:00
Lorenzo Colitti
30a5c3cca5
Merge "Allow unprivileged NetworkCallbacks to see other UIDs' networks." into sc-dev am: 846ae25be5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14597477
Change-Id: I83b704af8a5ee4a132030e973d301539c2e57fc3
2021-05-18 07:12:50 +00:00
Lorenzo Colitti
d82c1ec110
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
2021-05-18 12:24:07 +09:00
Chiachang Wang
c5b866e672
Merge "Dump only NORMAL priority information if no priority assigned" am: f93d99deae am: 7eaaaf6f1c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708333
Change-Id: Id1564d19efab63fbcfe161442fc85ba64a481160
2021-05-18 03:07:26 +00:00
Chiachang Wang
7eaaaf6f1c
Merge "Dump only NORMAL priority information if no priority assigned" am: f93d99deae
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708333
Change-Id: I7c3bd130b67c40bb8be23073dbfa4aaf85624016
2021-05-18 02:37:13 +00:00
Chiachang Wang
dc8fdde331
Dump only NORMAL priority information if no priority assigned
...
The legacy design of "dumpsys connectivity" will only dump
information with NORMAL priority. It was updated to provide
both NORMAL and HIGH priority information in order to support
dump in bugreport. However, it will also affect the result
using dumpsys connectivity.
Update design to dump NORMAL priority only to align with legacy
design.
Bug: 188387185
Test: adb shell dumpsys connectivity
Test: adb bugreport and check the result in bugreport
Change-Id: I6825c5038e48e3060c0c3ad1512bd584ef6d10a7
Merged-In: I6825c5038e48e3060c0c3ad1512bd584ef6d10a7
2021-05-18 02:13:42 +00:00
Aaron Huang
ddf42f822b
Merge "Add ConnectivityAnnotations class" into sc-dev am: 3610ac6ad1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186142
Change-Id: Ib74156e9f29e62e861d19f5b58a12ab106478b4c
2021-05-17 14:26:25 +00:00
Aaron Huang
3610ac6ad1
Merge "Add ConnectivityAnnotations class" into sc-dev
2021-05-17 14:07:45 +00:00
Chiachang Wang
987b73fbe0
Dump only NORMAL priority information if no priority assigned
...
The legacy design of "dumpsys connectivity" will only dump
information with NORMAL priority. It was updated to provide
both NORMAL and HIGH priority information in order to support
dump in bugreport. However, it will also affect the result
using dumpsys connectivity.
Update design to dump NORMAL priority only to align with legacy
design.
Bug: 188387185
Test: adb shell dumpsys connectivity
Test: adb bugreport and check the result in bugreport
Change-Id: I6825c5038e48e3060c0c3ad1512bd584ef6d10a7
2021-05-17 17:31:07 +08:00
Paul Hu
21860ce119
Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" am: accfb247b2 am: 993aaedf1e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689573
Change-Id: Ide30d62481724f0c93b6302ddc871ef7fe10cfd8
2021-05-17 08:06:08 +00:00
Paul Hu
993aaedf1e
Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" am: accfb247b2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689573
Change-Id: If352718bf7de1c6446f291710c2b114ffd57abc6
2021-05-17 07:31:32 +00:00
junyulai
59177af317
[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present
...
Test: atest NetworkRequestTest#testBypassingVcn
Fix: 176939355
Change-Id: I98dd3f4652dc067eb5c4666e952db6c854bcbb10
2021-05-17 07:04:13 +00:00
Paul Hu
accfb247b2
Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer"
2021-05-17 06:45:52 +00:00
junyulai
eb91ec2684
[FUI27] Fix internal naming of notifyNetworkStatus
...
Test: TH
Bug: 174123988
Merged-In: I970ee365ca221956ee85788005d331374b5fa71a
Change-Id: I970ee365ca221956ee85788005d331374b5fa71a
(cherry-picked from aosp/1620539)
2021-05-17 14:07:00 +08:00
junyulai
92aff0d836
[FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
...
Test: atest FrameworksNetTests
Bug: 174123988
Merged-In: I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1
Change-Id: I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1
(cherry-picked from aosp/1620859)
2021-05-17 14:07:00 +08:00
Paul Hu
70c7639228
Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" am: dec7232c75 am: 6d8b78770a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689572
Change-Id: I216224011720d64316b9801ef54859b8de2bdb89
2021-05-17 03:52:42 +00:00
Paul Hu
6d8b78770a
Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" am: dec7232c75
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689572
Change-Id: I5515f041b783e36ca439e2b7b1d77e93ee329be0
2021-05-17 03:28:16 +00:00
Paul Hu
dec7232c75
Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor"
2021-05-17 03:04:59 +00:00
Chiachang Wang
420d77919d
[automerger skipped] Merge "Replace clearAll with withoutDefaultCapabilities" am: 98546082cc am: d19bda6e8c -s ours
...
am skip reason: Merged-In Ida8d25d57504864f046e3403f593cc606fbfe982 with SHA-1 c5c3bfb20e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708330
Change-Id: I7c3a7d6d8ba6b93546d0b436f2d63ab2ae1d2bb9
2021-05-17 03:04:50 +00:00