Chiachang Wang
d699381492
[automerger skipped] Merge "Replace clearAll with withoutDefaultCapabilities" am: b4c624aece am: f27534ba53 -s ours
...
am skip reason: Merged-In Ida8d25d57504864f046e3403f593cc606fbfe982 with SHA-1 df9611cab7 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
Chiachang Wang
f27534ba53
Merge "Replace clearAll with withoutDefaultCapabilities" am: b4c624aece
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708330
Change-Id: Ibb29c90f818ca6f447d91f0eda0abe0ef82363dd
2021-05-17 02:29:35 +00:00
Chiachang Wang
b4c624aece
Merge "Replace clearAll with withoutDefaultCapabilities"
2021-05-17 01:56:52 +00:00
Junyu Lai
8bf72687e7
Merge changes I3ba50cbd,I970ee365 am: 2a7ab18c0b am: c8cdc6917c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859
Change-Id: If9a3e37e5359b955e330002d81cbeb48f90ee22b
2021-05-15 17:24:42 +00:00
Junyu Lai
c8cdc6917c
Merge changes I3ba50cbd,I970ee365 am: 2a7ab18c0b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859
Change-Id: I2cf4ea0abb1ff7bc74302cce16cbe8041b08d321
2021-05-15 16:53:30 +00:00
Junyu Lai
2a7ab18c0b
Merge changes I3ba50cbd,I970ee365
...
* changes:
[FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
[FUI27] Fix internal naming of notifyNetworkStatus
2021-05-15 16:21:38 +00:00
Jayachandran Chinnakkannu
20cdc61c13
Merge "QOS filter matching support based on remote address and port number for connected sockets" am: 6c5553aaaa am: f84276bde1 am: 9896622bd3 am: 65a0e0d0e5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813
Change-Id: I6cd8f7852b2231a59b990a20658a232df6ce87e4
2021-05-14 21:26:14 +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
2f5c67c1e1
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: I32f71d0bc49e6a348d64cb0adb8abf421677f306
2021-05-14 20:54:05 +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
junyulai
5744432f28
[FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
...
Test: atest FrameworksNetTests
Bug: 174123988
Change-Id: I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1
2021-05-14 19:48:17 +08:00
junyulai
07f3432fab
[FUI27] Fix internal naming of notifyNetworkStatus
...
Test: TH
Bug: 174123988
Change-Id: I970ee365ca221956ee85788005d331374b5fa71a
2021-05-14 19:48:17 +08: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
Chiachang Wang
cf6e5210ba
Replace clearAll with withoutDefaultCapabilities
...
As the feedback from API review, the clearAll method in Builder
does not match the actual usage. Thus, remove it and replace
with withoutDefaultCapabilities to provide clearer usage.
Bug: 184735772
Test: make update-api ; m
Change-Id: Ida8d25d57504864f046e3403f593cc606fbfe982
Merged-In: Ida8d25d57504864f046e3403f593cc606fbfe982
2021-05-14 10:36:37 +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
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
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
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
Remi NGUYEN VAN
0d4293db8d
[automerger skipped] Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: 611cf21fd2 am: d116ced363 -s ours
...
am skip reason: Merged-In I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4 with SHA-1 f19e30d337 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705549
Change-Id: I15d4f795062ca5f44b9291e14c96e7fa6890e98a
2021-05-14 07:26:47 +00:00
Treehugger Robot
7d3f9da1c6
[automerger skipped] Merge "Move connectivity sources to packages/Connectivity" am: b249b941ee am: a69e3de8bb am: 786cd4a19a -s ours
...
am skip reason: Merged-In I26d1a274058fa38763ad4f605549d880865b4d76 with SHA-1 028cb1b7a8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706845
Change-Id: Idf91bcf36f6e79ab7f5c91d9939a3b7f742d73dd
2021-05-14 07:26:24 +00:00
Remi NGUYEN VAN
dc56aa2620
Move connectivity test defaults to tests/common
...
The build file currently holds a single build rule in test/. Move it to
the existing build file in tests/common/Android.bp.
Test: m
Bug: 186628461
Change-Id: I3948c9b46e2647f945a22f16aad493e94fe50b4d
2021-05-14 07:24:53 +00:00
Remi NGUYEN VAN
d116ced363
Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: 611cf21fd2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705549
Change-Id: I486b0d2759200a5a1bb9679577f5d97ea43c252b
2021-05-14 07:08:58 +00:00
Treehugger Robot
786cd4a19a
Merge "Move connectivity sources to packages/Connectivity" am: b249b941ee am: a69e3de8bb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706845
Change-Id: Ia2b0715ed1f144216c1f64069757bf717a3f083f
2021-05-14 07:08:44 +00:00
Chiachang Wang
df9611cab7
Replace clearAll with withoutDefaultCapabilities
...
As the feedback from API review, the clearAll method in Builder
does not match the actual usage. Thus, remove it and replace
with withoutDefaultCapabilities to provide clearer usage.
Bug: 184735772
Test: make update-api ; m
Change-Id: Ida8d25d57504864f046e3403f593cc606fbfe982
CTS-Coverage-Bug: 186061922
2021-05-14 14:53:47 +08:00
Remi NGUYEN VAN
611cf21fd2
Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705549
Change-Id: Ib8967ac75b038202430a74276a632b37973ed92b
2021-05-14 06:47:49 +00:00
Treehugger Robot
a69e3de8bb
Merge "Move connectivity sources to packages/Connectivity" am: b249b941ee
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706845
Change-Id: Id619f74f84699c8f63edad37beb63537b7c06b3d
2021-05-14 06:41:07 +00:00
Ken Chen
4f612fae1f
Reference unreachable netId from INetd
...
Bug: 181579204
Test: m; atest FrameworksNetTests
Change-Id: Id0d30363abe583459a8022e7400aab1dd4f72939
2021-05-14 14:30:43 +08:00
Chalard Jean
6948544a4d
Make yield-to-bad-wifi behavior backward compatible with R
...
Yielding cell wins to exiting wifi (whether good or bad).
It loses to bad wifi that's not exiting.
In R, yielding to bad wifi only affects wifis that are
unvalidated, but a wifi that is exiting should still be
dropped in favor of a cell that yields to bad wifi.
I had misunderstood the policy and implemented it wrong.
Now it's implemented right, and has careful tests.
Test: new tests for this
Bug: 186458024
Change-Id: Ib8637100d491e72a2edb837584ce55b7dda58524
2021-05-14 15:27:12 +09:00
Aaron Huang
9ff12842da
Rename *Iface* APIs to *Interface*
...
Address API review feedback, other APIs have been refering to
these as "interface" instead of "iface" so migrate the APIs named
*Iface* to *Interface*.
(cherry-picked from ag/14326779)
Bug: 183972554
Test: atest android.net.UnderlyingNetworkInfoTest
Merged-In: I38b476e762fb57fa88c4a789092d0af6f5330d80
Change-Id: I38b476e762fb57fa88c4a789092d0af6f5330d80
2021-05-14 11:05:22 +08:00
Remi NGUYEN VAN
c71c789184
Move NetIdManager, ProfileNetworkPreferences
...
Move NetIdManager and ProfileNetworkPreferences from services/core to
packages/Connectivity/service.
This is a partial cherry-pick of a downstream change.
Bug: 186628461
Test: m
Merged-In: I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4
Change-Id: I6734c181dac39518b8d69be1e49d7f5f0a0a18da
2021-05-13 18:18:42 +00:00