Mark Chien
b0fcd5f0c5
Check whether feature is enabled by compare with apex version
...
Replace the isFeatureEnabled function which is check with apex version.
Bug: 187946226
Test: Set device config flag and check the result
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708088
Ignore-AOSP-First: manual cherry-pick from AOSP build automerge is broken
Change-Id: Iefbd6fa6a061614b83d115219f8939dee8794bb7
2021-05-18 09:44:43 +00:00
Treehugger Robot
82e910ecc5
Merge "[VCN21.1] Verify capability is not added if specifier is present" am: 20d9f4722e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705134
Change-Id: Iae49fd663e9b90e935b9065ef60561f2b4c55439
2021-05-18 09:36:16 +00:00
Treehugger Robot
20d9f4722e
Merge "[VCN21.1] Verify capability is not added if specifier is present"
2021-05-18 08:35:06 +00:00
Lorenzo Colitti
02de682901
Merge "Add a CTS tests for setIncludeOtherUidNetworks." into sc-dev
2021-05-18 06:47:43 +00:00
Lorenzo Colitti
ad9c644b6b
Add a CTS tests for setIncludeOtherUidNetworks.
...
Bug: 187921303
Test: test-only change
Ignore-AOSP-First: avoid merge conflicts
Change-Id: I8e259041dad3fb9c38202cbb12b344de15f4101f
2021-05-18 04:43:20 +00:00
Mark Chien
c59d6fa12d
Merge "Check whether feature is enabled by compare with apex version" am: 84a8a13a92
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708088
Change-Id: Iefbd6fa6a061614b83d115219f8939dee8794bb7
2021-05-18 03:37:13 +00:00
Lorenzo Colitti
86714b1fd2
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
Mark Chien
84a8a13a92
Merge "Check whether feature is enabled by compare with apex version"
2021-05-18 03:09:20 +00:00
Chiachang Wang
12d32a673f
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
985e1e337d
Merge "Add required permission to Tethering" into sc-dev
2021-05-17 14:15:54 +00:00
Aaron Huang
1bbb7a7570
Merge "Add ConnectivityAnnotations class" into sc-dev
2021-05-17 14:07:45 +00:00
junyulai
7968fba7ad
Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots
...
This is declared in the API surface, but the implementation
does not match.
Ignore-AOSP-First: Needs cherry-picks
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest#testGetAllNetworkStateSnapshots
Bug: 188140631
Change-Id: I97aa69651461ebe5c323ec669372f9a61b84e6a6
2021-05-17 21:53:18 +08:00
junyulai
f15fb56f73
[VCN21.1] Verify capability is not added if specifier is present
...
Test: atest NetworkRequestTest#testBypassingVcn
Bug: 176939355
Change-Id: I3fdd7a08ac9fd667633b68dc935abce024dd3a4d
2021-05-17 07:03:53 +00:00
junyulai
0f57022302
[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
junyulai
6322aeb7f0
[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
TreeHugger Robot
4547356487
Merge "Use SettingsShim to hide different implementation in shim" into sc-dev
2021-05-15 06:27:38 +00:00
Jayachandran Chinnakkannu
65a0e0d0e5
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
2021-05-14 21:19:17 +00:00
Jayachandran Chinnakkannu
9896622bd3
Merge "QOS filter matching support based on remote address and port number for connected sockets" am: 6c5553aaaa am: f84276bde1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813
Change-Id: I6f1d972f822b022995cfdc99942f1167a4f8ef0d
2021-05-14 20:53:05 +00:00
Jayachandran Chinnakkannu
f84276bde1
Merge "QOS filter matching support based on remote address and port number for connected sockets" am: 6c5553aaaa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813
Change-Id: Ibd70a86d82d4810425288694f2e3904d471a2d24
2021-05-14 20:28:38 +00:00
Jayachandran Chinnakkannu
6c5553aaaa
Merge "QOS filter matching support based on remote address and port number for connected sockets"
2021-05-14 20:02:30 +00:00
Junyu Lai
3239a62913
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
2021-05-14 12:20:10 +00:00
Junyu Lai
13bcaf5446
Merge "[FUI26] Address comments on aosp/1560408" am: 8f03f1e788 am: e5929c073c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845
Change-Id: If6b9da9ce754f33868305075013b0f82ff64fedb
2021-05-14 12:03:29 +00:00
Junyu Lai
e5929c073c
Merge "[FUI26] Address comments on aosp/1560408" am: 8f03f1e788
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845
Change-Id: Idde0e161d6241a5c45c0b751e1fca912ed10c7a8
2021-05-14 11:48:14 +00:00
Junyu Lai
8f03f1e788
Merge "[FUI26] Address comments on aosp/1560408"
2021-05-14 11:34:09 +00:00
Paul Hu
5aa8c52638
Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: 16c34f0d8b am: 38544887c7 am: 95f5f547fc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708327
Change-Id: Ia8e395132226d23fdfb8cd4c93c004c459386104
2021-05-14 11:00:38 +00:00
Paul Hu
95f5f547fc
Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: 16c34f0d8b am: 38544887c7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708327
Change-Id: Iedd6429e956f77ba595f5dd6029c48a487ddbf0c
2021-05-14 10:41:33 +00:00
TreeHugger Robot
6d13c8325b
Merge "Move connectivity test defaults to tests/common" into sc-dev
2021-05-14 10:40:28 +00:00
Mark Chien
1ae2293558
Merge "Test mts against last stable api level" am: a59a146b36 am: 9015e276aa am: a9ba6f4c25
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686012
Change-Id: Ia17a88bf2f5ab09f46f0af904da63f4c3c4ad3d1
2021-05-14 10:27:17 +00:00
Mark Chien
540f0d3ce3
Merge "Test mts against last stable api level" am: a59a146b36 am: 9015e276aa am: 726b814899
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686012
Change-Id: I9d2d08b9c9397c247e2afd54b25a21631233c585
2021-05-14 10:26:06 +00:00
Paul Hu
38544887c7
Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: 16c34f0d8b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708327
Change-Id: I0c9966c379e956fbf8a01d81d5f1dd0e68662763
2021-05-14 10:25:37 +00:00
Aaron Huang
489b5a96ee
[automerger skipped] Merge "Rename *Iface* APIs to *Interface*" am: 7bb6abb413 am: c0ad457264 am: 9dc99ca54b -s ours
...
am skip reason: Merged-In I38b476e762fb57fa88c4a789092d0af6f5330d80 with SHA-1 a10cc3aa60 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585
Change-Id: I39709941a1770435d9a2e221025b46eed5d32ea0
2021-05-14 10:07:18 +00:00
Treehugger Robot
5c6bb2dfdb
Merge "Reference unreachable netId from INetd" am: 01be14fd53 am: 68413f8a69 am: 3bf71e4e85
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326
Change-Id: Ia8db25ba86450341d4b9278eba350014fa3b880c
2021-05-14 10:06:00 +00:00
Mark Chien
726b814899
Merge "Test mts against last stable api level" am: a59a146b36 am: 9015e276aa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686012
Change-Id: I34e9a66e7d603fe71c5ee1591787344e245b70ac
2021-05-14 10:03:22 +00:00
Mark Chien
a9ba6f4c25
Merge "Test mts against last stable api level" am: a59a146b36 am: 9015e276aa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686012
Change-Id: I0cac4fef0300e0b341c7090c5be6e9489c62794f
2021-05-14 10:03:19 +00:00
Paul Hu
16c34f0d8b
Merge "Address [set|get]RestrictedAllowedApps API review feedback"
2021-05-14 10:00:39 +00:00
TreeHugger Robot
27ec718008
Merge "Address comments on ag/14486203" into sc-dev
2021-05-14 09:59:43 +00:00
Aaron Huang
9dc99ca54b
Merge "Rename *Iface* APIs to *Interface*" am: 7bb6abb413 am: c0ad457264
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585
Change-Id: I9aa62677f52ac78916c518d1378a05bda143f676
2021-05-14 09:44:33 +00:00
Aaron Huang
c0ad457264
Merge "Rename *Iface* APIs to *Interface*" am: 7bb6abb413
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585
Change-Id: I62fa0403c8b2d78e7e7a90be8ac804576ec27456
2021-05-14 09:36:36 +00:00
Treehugger Robot
3bf71e4e85
Merge "Reference unreachable netId from INetd" am: 01be14fd53 am: 68413f8a69
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326
Change-Id: I2f14897dda29c6ea4469952e56a0fa0e1c8a9a8f
2021-05-14 09:36:35 +00:00
Mark Chien
9015e276aa
Merge "Test mts against last stable api level" am: a59a146b36
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686012
Change-Id: I51562dc48242c7d2f2f53f7f9fe7b5797e945ede
2021-05-14 09:36:00 +00:00
Chiachang Wang
ab124bea0c
Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev
2021-05-14 09:32:42 +00:00
Aaron Huang
7bb6abb413
Merge "Rename *Iface* APIs to *Interface*"
2021-05-14 09:11:29 +00:00
Mark Chien
a59a146b36
Merge "Test mts against last stable api level"
2021-05-14 09:00:11 +00:00
markchien
a3ef48117f
Check whether feature is enabled by compare with apex version
...
Replace the isFeatureEnabled function which is check with apex version.
Bug: 187946226
Test: Set device config flag and check the result
Change-Id: Iba44a01e2fdd0698dcb338ea4a8fe8147cbaa7dd
2021-05-14 16:56:33 +08:00
Treehugger Robot
68413f8a69
Merge "Reference unreachable netId from INetd" am: 01be14fd53
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326
Change-Id: Iedbf9e9b150c95aa0da6a7b20af0dd1412703e2b
2021-05-14 08:39:18 +00:00
Chalard Jean
b9e49ec514
Address comments on ag/14486203
...
Bug: 186458024
Test: comment-only change
Change-Id: I7b086abbb57354086e8fb1a41c63140f2227173f
2021-05-14 17:31:30 +09:00
Chalard Jean
81fc852de2
Merge "Make yield-to-bad-wifi behavior backward compatible with R" into sc-dev
2021-05-14 08:21:27 +00:00
Treehugger Robot
01be14fd53
Merge "Reference unreachable netId from INetd"
2021-05-14 08:08:08 +00:00
junyulai
c6422b78ea
[FUI26] Address comments on aosp/1560408
...
Test: TH
Bug: 174123988
Change-Id: I949eeb8903e903d8ede90521442b1f917d5cdfeb
2021-05-14 15:57:44 +08:00
paulhu
257a5cf7ad
Address [set|get]RestrictedAllowedApps API review feedback
...
- Rename [set|get]RestrictedAllowedApps to
[set|get]AppsAllowedOnRestrictedNetworks
- Remove the regex of validate package name check
Bug: 188085693
Test: m update-api && m
Change-Id: I07966fb66093523a67e1e6a1ecfa05cc399e22f2
2021-05-14 15:27:36 +08:00