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
8a6fcb1391
Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56 am: c7ea77ce6a am: 3034280a1f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705135
Change-Id: Ic403510764eb2745f7cb6e42cf18771fea801880
2021-05-14 06:42:49 +00:00
Treehugger Robot
3c5a00a31c
Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56 am: c7ea77ce6a am: ad56a81b2d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705135
Change-Id: I0e4deaccf95ea9422654e85a3fa4df9d6752455e
2021-05-14 06:41:40 +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
Treehugger Robot
3034280a1f
Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56 am: c7ea77ce6a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705135
Change-Id: I00e51d4f8de97c7b67aef028e9ee358678e82379
2021-05-14 06:25:27 +00:00
Treehugger Robot
ad56a81b2d
Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56 am: c7ea77ce6a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705135
Change-Id: If5ab413d6cea71a3dcc98634d7ad8a11fbd2bbd1
2021-05-14 06:25:15 +00:00
Treehugger Robot
c7ea77ce6a
Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705135
Change-Id: I0de41fe2ba6d2bc691b5693a81da368ae5e0e025
2021-05-14 06:10:30 +00:00
Treehugger Robot
6748f93e56
Merge "Re-enable check for VpnTransportInfo session ID."
2021-05-14 05:58:35 +00:00
Treehugger Robot
a36bdafbf0
Merge "Don't run testRequestBackgroundNetwork in instant app mode" am: 3531b188ce am: e7bb625eaf am: 3e35248588
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1695289
Change-Id: I397922aa251135f8eccb020a878cb0dba09bb960
2021-05-14 05:10:59 +00:00
Treehugger Robot
e7cbc00b27
Merge "Don't run testRequestBackgroundNetwork in instant app mode" am: 3531b188ce am: e7bb625eaf am: 0d5000dbbd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1695289
Change-Id: Icc5b0fff3d74f3f577e591fcb7046f4c42da558e
2021-05-14 05:09:38 +00:00
Treehugger Robot
3e35248588
Merge "Don't run testRequestBackgroundNetwork in instant app mode" am: 3531b188ce am: e7bb625eaf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1695289
Change-Id: I20ed893903150e44e1fe6f4bd13ae2ea2b0c537c
2021-05-14 04:54:08 +00:00
Treehugger Robot
0d5000dbbd
Merge "Don't run testRequestBackgroundNetwork in instant app mode" am: 3531b188ce am: e7bb625eaf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1695289
Change-Id: Iec0e338d556495c7a2e14b273d8fefad31983dd8
2021-05-14 04:53:58 +00:00
Treehugger Robot
e7bb625eaf
Merge "Don't run testRequestBackgroundNetwork in instant app mode" am: 3531b188ce
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1695289
Change-Id: Ib447d41a24fedf2b23881653c23674f526a37c65
2021-05-14 04:37:49 +00:00
Treehugger Robot
3531b188ce
Merge "Don't run testRequestBackgroundNetwork in instant app mode"
2021-05-14 04:09:43 +00:00
Nucca Chen
c702f5c9ba
Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f am: 72bd34e343 am: 6b5e448f79
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703125
Change-Id: Ifb15fec20d7fc52ee230df330113d4ba0316426f
2021-05-14 03:26:46 +00:00
Junyu Lai
655aaef84b
[automerger skipped] Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504 am: ab2a5cd02f -s ours
...
am skip reason: Merged-In I0b02d01cd8749d81c9d020dee7fdb4f80e18ae98 with SHA-1 36aa3f237c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006
Change-Id: If646033a664673f26961a7d7f35fce865e2a6794
2021-05-14 03:26:19 +00:00
Nucca Chen
1ed7317a2f
Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f am: 72bd34e343 am: 76cc470496
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703125
Change-Id: I5669ff227f761da71d8ad12cf7e0a228b3621d81
2021-05-14 03:25:05 +00:00
Junyu Lai
d0fc569f67
[automerger skipped] Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504 am: d1c8af2783 -s ours
...
am skip reason: Merged-In I0b02d01cd8749d81c9d020dee7fdb4f80e18ae98 with SHA-1 36aa3f237c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006
Change-Id: I4933ce379eafa34222c8e22c6da535fb508e3428
2021-05-14 03:25:00 +00: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
Nucca Chen
6b5e448f79
Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f am: 72bd34e343
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703125
Change-Id: Ibe31ffe2b6427e294d947d1e6462df30be9f5a35
2021-05-14 03:01:34 +00:00
Nucca Chen
76cc470496
Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f am: 72bd34e343
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703125
Change-Id: I8ed82b1f5b8fa35e398c6d8c3bc928a03ee6318c
2021-05-14 03:01:16 +00:00
Junyu Lai
d1c8af2783
Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006
Change-Id: I436b4a50f672bf6ea84b41efc973135b41b20f5e
2021-05-14 03:01:10 +00:00
Junyu Lai
ab2a5cd02f
Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006
Change-Id: I5b925a63b8e7eb9b28170709d6f1213071552f57
2021-05-14 03:01:05 +00:00
Nucca Chen
72bd34e343
Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703125
Change-Id: Ic4bcba98c1f1e43314a0a9797b427fee4bb0c20e
2021-05-14 02:46:15 +00:00
Junyu Lai
b8c3c59504
Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683006
Change-Id: I97fba52572d7244106b3ee3770431939804dbc5a
2021-05-14 02:46:08 +00:00
Nucca Chen
aa10ddfa6f
Merge "bpf: Add interface index to BPF devmap"
2021-05-14 02:45:38 +00:00
Aaron Huang
6a7e6ad55c
Add ConnectivityAnnotations class
...
This change is to address API review, add respective
@IntDef for network policy API.
Typedef cannot be exposed as SystemApi so add
ConnectivityAnnotations class and add an annotation library
so that it can be used in module and platform.
Bug: 183972925
Test: m, build doc target framework-doc-stubs_annotations.zip
and check the APIs have an attribute IntDef annotation
Change-Id: Ie3ec40cf48818edd422a4550377774eae387d3b2
2021-05-14 10:30:49 +08:00
Junyu Lai
4ec15d5d71
Merge "[SP32.3] No-op refactoring of OffloadControllerTest"
2021-05-14 02:18:12 +00: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
Remi NGUYEN VAN
cdb45f8e37
Move connectivity sources to packages/Connectivity
...
The service-connectivity sources should be in
packages/modules/Connectivity. Move them to
frameworks/base/packages/Connectivity, so that the whole directory can
be moved to the dedicated packages/modules/Connectivity git project.
Bug: 186628461
Test: m
Merged-In: I26d1a274058fa38763ad4f605549d880865b4d76
Change-Id: Ie0562db92ebee269b901926d763ae907bde61b98
2021-05-13 18:18:42 +00:00
Mark Chien
ec738f3e36
Merge "Revert "Add ACCESS_NETWORK_STATE to Tethering CTS"" into sc-dev
2021-05-13 17:45:31 +00:00
Mark Chien
0d18d18252
Revert "Add ACCESS_NETWORK_STATE to Tethering CTS"
...
This reverts commit 90255ef0a7 .
Reason for revert: this change break TetheringCoverageTests which test whether guard with proper permission (ACCESS_NETWORK_STATE). Instead of adding permission to test, use runAsShell with ACCESS_NETWORK_STATE: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426/1/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
Bug: 187371740
Change-Id: Id8f27dce237ab34c1a735ce4678e661a6113377e
2021-05-13 17:44:05 +00:00
TreeHugger Robot
4959976b6f
Merge "Fix MtsTetheringTest fail to access hidden tethering api problem" into sc-dev
2021-05-13 17:31:01 +00:00
Remi NGUYEN VAN
e4472e3151
[automerger skipped] Merge "[NS04] Introduce Network Offers and their callbacks" am: 393e7b3d6a am: 02e05de21f am: 6ae56eaf3f -s ours
...
am skip reason: Merged-In Idec1fe8eb4ac6f562bf098e3dd470f11024d04f2 with SHA-1 d1b498b16d is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556102
Change-Id: Idf45cf2f62c4ba2182f00ae2f05c150e0fdb6d21
2021-05-13 17:02:34 +00:00
Lorenzo Colitti
ec2208249c
[automerger skipped] Merge changes Ia5bc896c,I0c9406f4,I3108ee94 am: e562d167a5 am: 3a22116ce4 am: ae93b39b60 -s ours
...
am skip reason: skipped by user lorenzo
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705389
Change-Id: Icc5d80d32409711650384577150e9d309788b001
2021-05-13 17:01:54 +00:00
Mark Chien
e215c9d6a8
Merge "Fix some TetheringCoverageTest failure" am: 08b89743de am: bf74c05038 am: 11f7f5d4b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426
Change-Id: Ifbdf1e2b1a4f74fa4e8bbdad5de62cbd346efe0f
2021-05-13 16:54:44 +00:00
Jayachandran C
735e1ce55b
QOS filter matching support based on remote address and port number for connected sockets
...
This CL adds APIs for telephony to perform filter matching based on
remote address if the socket is connected. Additional checks will be
performed on the state of socket to avoid the future callbacks in a
separate CL.
Bug: 181916576
Test: Manually verified in live T-Mobile network
atest ConnectivityServiceTest
atest com.android.internal.telephony.dataconnection.QosCallbackTrackerTest
Change-Id: I6fbd4e84c76bc4acbf4e59f06f8e86e0237bae29
2021-05-13 09:50:13 -07:00
Mark Chien
b88f9f0575
Merge "Fix some TetheringCoverageTest failure" am: 08b89743de am: bf74c05038 am: 3d4f367a25
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426
Change-Id: Id89d14377c2df4055d7a701129449a68007d40f1
2021-05-13 16:45:01 +00:00
Mark Chien
11f7f5d4b7
Merge "Fix some TetheringCoverageTest failure" am: 08b89743de am: bf74c05038
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426
Change-Id: I7aa5207bbca37d5599ce678f67d466bf186abd8b
2021-05-13 16:24:04 +00:00
Mark Chien
3d4f367a25
Merge "Fix some TetheringCoverageTest failure" am: 08b89743de am: bf74c05038
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426
Change-Id: I8d522afdf7e1b9ec26fbd4f491f7b95e9ccfecc6
2021-05-13 16:22:01 +00:00
Mark Chien
bf74c05038
Merge "Fix some TetheringCoverageTest failure" am: 08b89743de
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1699426
Change-Id: Id3b14e197d1cd42a2a0dfa4c4c7cef2d052cbf9c
2021-05-13 16:00:40 +00:00
TreeHugger Robot
3345125c08
Merge changes from topic "sp31" into sc-dev
...
* changes:
[SP35] Pass data warning to tethering offload
[SP34] Adapt onSetWarningAndLimit
2021-05-13 15:52:59 +00:00