Merge "Add a method to create a TAP interface with a given interface name." am: 7d7e7cd1fe am: 3c78a24a9a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2059333
Change-Id: I02068707effdb1f3308c4b1997c0ece8bdb21f28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Xiao Ma
authored and
Automerger Merge Worker
commited 2022-04-22 13:40:03 +00:00
a456b23ad5
Merge "Add a method to create a TAP interface with a given interface name." am: 7d7e7cd1fe
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2059333
Change-Id: Id882dfb9510ddc794719e9b3860d0d98ef09f41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Xiao Ma
authored and
Automerger Merge Worker
commited 2022-04-22 13:24:59 +00:00
3c78a24a9a
Merge "Add a method to create a TAP interface with a given interface name."
Xiao Ma
authored and
Gerrit Code Review
commited 2022-04-22 13:10:19 +00:00
7d7e7cd1fe
Add a method to create a TAP interface with a given interface name.
...
Add a method that allows the caller to specify whether to create a
tap interface with a given specific interface name instead of the
default one. So far only the given name that starts with "v4-testtap"
or "v4-testtun" prefix is allowed. That's helpful to create a clat
interface which always has "v4-" clat prefix in the IpClient integration
test, to verify the callbacks happend on adding/removing clat interface.
Bug: 163492391
Test: atest CtsNetTestCases
Change-Id: I9ea7013fce919cafb719998a123164b5507f9ac0
Xiao Ma
commited 2022-04-21 16:57:22 +09:00
8bbb8089d7
Merge "Filter out excluded routes in LinkProperties" am: ac8935bee7 am: bb8601a015
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1619104
Change-Id: I27c51a479eeb3f70c6c986f3235f4be27441ba7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Taras Antoshchuk
authored and
Automerger Merge Worker
commited 2022-04-13 13:47:24 +00:00
819056e0b8
Merge "Filter out excluded routes in LinkProperties" am: ac8935bee7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1619104
Change-Id: I595957964b5c7edea752a3f76791503a3b896ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Taras Antoshchuk
authored and
Automerger Merge Worker
commited 2022-04-13 12:45:04 +00:00
bb8601a015
Merge "Filter out excluded routes in LinkProperties"
Taras Antoshchuk
authored and
Gerrit Code Review
commited 2022-04-13 12:29:24 +00:00
ac8935bee7
Merge "Add protection for setLocalRoutesExcludedForVpn" am: 620ea6f1fc am: 24e279166f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2019875
Change-Id: Ieeeaec9cccfcebb02f69195ddb02bec6f507aaf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-04-13 04:59:38 +00:00
4ac020975d
Merge "Add protection for setLocalRoutesExcludedForVpn" am: 620ea6f1fc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2019875
Change-Id: Ieb5616f6dcae94a6894185da4f26b34ba6c698b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-04-13 04:36:03 +00:00
24e279166f
Merge "Add protection for setLocalRoutesExcludedForVpn"
Chiachang Wang
authored and
Gerrit Code Review
commited 2022-04-13 04:19:42 +00:00
620ea6f1fc
Filter out excluded routes in LinkProperties
...
Gate presence of excluded routes in LinkProperties on target sdk T.
Bug: 186082280
Test: atest LinkPropertiesTest
Change-Id: If8fdb468a0a4968c5f2a878b7aacfeb4f7d9a9e5
Taras Antoshchuk
commited 2022-04-13 01:17:56 +02:00
30d41e59bc
Merge changes from topic "MDns_AIDL" am: 09475308b7 am: 06e59627bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2049246
Change-Id: I16b7ec71fbfee1dd0de84b1f64d5e9fbbd62f4e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2022-04-07 03:10:55 +00:00
ac780d3bd0
Merge changes from topic "MDns_AIDL" am: 09475308b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2049246
Change-Id: I2f4c2952ae732350ebc0608fde6263ed20061e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2022-04-07 02:42:02 +00:00
06e59627bb
Add MDnsManager
...
- Have MDnsManager to manage mdns native service binder call.
- Register it as a system service for NsdService.
- NsdService will use aidl to communicate with mdns, so add the
relevant lib to framework-connectivity
- Add jarjar rule for mdns-aidl-interface classes.
Bug: 209894875
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: Ibc8b726c01a15015b450caf94d0afed570117b7f
paulhu
commited 2022-04-04 15:02:17 +00:00
541b72d03b
Merge "Support QosCallback with UDP socket" am: 2304205a58 am: 19100e4ab4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2010317
Change-Id: Ic70e9026f3e09c8bc215db7a37dfd402c592ff6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Sewook Seo
authored and
Automerger Merge Worker
commited 2022-03-30 20:36:46 +00:00
282b15592c
Merge "Support QosCallback with UDP socket" am: 2304205a58
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2010317
Change-Id: I3e5df1bd44defbb9dd0c382c625a21e176368f2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Sewook Seo
authored and
Automerger Merge Worker
commited 2022-03-30 20:19:43 +00:00
19100e4ab4
Merge "Support QosCallback with UDP socket"
Sewook Seo
authored and
Gerrit Code Review
commited 2022-03-30 20:01:45 +00:00
2304205a58
Merge "Add @RequiresPermission for setUnderlyingNetworks" am: 41ed965e68 am: 4f06481872
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1912735
Change-Id: Id8b4b2517d7e4f33c2553c0914d80e1ee0f3db60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Lucas Lin
authored and
Automerger Merge Worker
commited 2022-03-29 17:06:22 +00:00
7b59f9253c
Merge "Add @RequiresPermission for setUnderlyingNetworks" am: 41ed965e68
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1912735
Change-Id: I61eb7090cde92028908c1294e753b6e0f0b8380f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Lucas Lin
authored and
Automerger Merge Worker
commited 2022-03-29 16:24:37 +00:00
4f06481872
Merge "Add @RequiresPermission for setUnderlyingNetworks"
Lucas Lin
authored and
Gerrit Code Review
commited 2022-03-29 15:34:17 +00:00
41ed965e68
Improve JavaDoc for FirewallRule constants am: 011a7f51c1 am: 04b2f3c7df
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2046447
Change-Id: I1e2690d4c3782c0e916c3374134b4e1872e8a08b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
markchien
authored and
Automerger Merge Worker
commited 2022-03-29 09:45:19 +00:00
df77455353
Improve JavaDoc for FirewallRule constants am: 011a7f51c1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2046447
Change-Id: I318f2a08beacd7ec96ff74b2a8ddc493fee86a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
markchien
authored and
Automerger Merge Worker
commited 2022-03-29 08:45:55 +00:00
04b2f3c7df
Improve JavaDoc for FirewallRule constants
...
Bug: 226946569
Test: TH
Change-Id: I8366bd58194e24da7ea74bf398aae196482d0151
markchien
commited 2022-03-29 12:28:25 +08:00
011a7f51c1
Merge "Api review: change updateFirewallRule to setUidFirewallRule" am: 3d4de57752
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2045104
Change-Id: I2bcb7edd69d6e364895cf18ce5f089f80cacb13e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-03-29 04:04:12 +00:00
ff33b2e819
Merge "Api review: change updateFirewallRule to setUidFirewallRule"
Treehugger Robot
authored and
Gerrit Code Review
commited 2022-03-29 03:41:02 +00:00
3d4de57752
Support QosCallback with UDP socket
...
Add a constructor for QosSocketInfo using DatagramSocket.
Bug: 203146631
Test: atest & verified on LTE test equipment
Change-Id: I85c091a65610a96d721e4f0b07631867cda4db8a
sewookseo
commited 2022-03-29 02:38:05 +00:00
82657d70d7
Merge changes from topic "conn_t_move_tmdev" into tm-dev
...
* changes:
Use Sources.bp for building
Merge history of ConnectivityT
Remi NGUYEN VAN
authored and
Android (Google) Code Review
commited 2022-03-25 11:19:00 +00:00
532fa3292b
Merge history of ConnectivityT
...
Renamed files/directories:
ConnectivityT/service/Android.bp --> service-t/Sources.bp
ConnectivityT/framework-t/Android.bp --> framework-t/Sources.bp
ConnectivityT/framework-t/aidl-export --> framework/aidl-export
ConnectivityT/service --> service-t
ConnectivityT/framework-t --> framework-t
ConnectivityT/tests --> tests
ConnectivityT/OWNERS --> (removed)
BUG: 222234190
TEST: TH
Ignore-AOSP-First: Move with history done per-branch
Merged-In: I81893df9f327abb84f1561b2b33027a2d23a4d65
Merged-In: I67c703e3f7aa9d5787f032a79ed62e45412baf4f
Change-Id: I27a91f1a94f9d807f92762436f533c4b0d0114d5
Remi NGUYEN VAN
commited 2022-03-25 11:02:45 +00:00
700ffc994f
Api review: change updateFirewallRule to setUidFirewallRule
...
Bug: 218494748
Test: TH
Change-Id: I52a02ebe109b687359f579c16fded4af3c9cd242
Merged-In: I52a02ebe109b687359f579c16fded4af3c9cd242
markchien
commited 2022-03-25 18:49:08 +08:00
3c04e66da0
Merge "Api review: change updateFirewallRule to setUidFirewallRule" into tm-dev
Mark Chien
authored and
Android (Google) Code Review
commited 2022-03-25 10:14:27 +00:00
0a2f78a29c
Api review: change updateFirewallRule to setUidFirewallRule
...
Bug: 218494748
Test: TH
Ignore-AOSP-First: to avoid diamond automerge cause build break, will
cherry-pick back to AOSP once this is merged
Change-Id: I52a02ebe109b687359f579c16fded4af3c9cd242
markchien
commited 2022-03-25 13:32:57 +08:00
4b00f76859
Move the DscpPolicy status constants and IntDef to NetworkAgent.
...
As requested by API council.
Also fix lint errors in the test.
Fix: 217366078
Test: existing tests modified in this CL
Change-Id: I8f7cd0e78bf29aeb52ec6a08a5d635d25fa2205d
Lorenzo Colitti
commited 2022-03-25 01:06:46 +09:00
fbe1576139
Merge history of ConnectivityT
...
Renamed files/directories:
ConnectivityT/service/Android.bp --> service-t/Sources.bp
ConnectivityT/framework-t/Android.bp --> framework-t/Sources.bp
ConnectivityT/framework-t/aidl-export --> framework/aidl-export
ConnectivityT/service --> service-t
ConnectivityT/framework-t --> framework-t
ConnectivityT/tests --> tests
ConnectivityT/OWNERS --> (removed)
BUG: 222234190
TEST: TH
Merged-In: I1fe5091361c7766dc7b6b4fb8c7b62d403e950bb
Change-Id: Ib592434ff50c06e25894f6ed7d7e3e8e1e3ea67b
Remi NGUYEN VAN
commited 2022-03-24 14:19:13 +00:00
3464805acc
Rename destroyAndAwaitReplacement to unregisterAfterReplacement.
...
Rename requested by API council.
Fix: 224764301
Test: existing CTS tests updated
Change-Id: Ibab9c9cd64bf0dde1e22705e81cff11d356fc719
Lorenzo Colitti
commited 2022-03-24 01:12:26 +09:00
a63e2341d6
Add @RequiresPermission for setUnderlyingNetworks
...
setUnderlyingNetworks() is mainly for the NetworkAgents who hold
the NETWORK_FACTORY to set its underlying networks.
And the underlying networks are only visible and useful for the
caller of getNetworkCapabilities() or the receiver of
onCapabilitiesChanged() who hold one of NETWORK_FACTORY,
NETWORK_SETTINGS and MAINLINE_NETWORK_STACK permissions.
Otherwise, the underlying networks field will be cleard before
sending.
Bug: 205738644
Test: atest CtsNetTestCases:ConnectivityManagerTest
atest CtsHostsideNetworkTests:HostsideVpnTests
atest FrameworksNetTests
Change-Id: Ife7630d9676a31ee5ab977cb1b87aec3b6fd7080
lucaslin
commited 2022-03-22 18:15:09 +08:00
69e1aa9117
Fix proto invalid write type
...
While dumpProtoLocked is called, InvalidProtocolBufferException
occurred because types are mismatched between platform side and
module side.
netstats.proto was moved into connectivity module, both the
platform(incident.proto) and the module uses protoc-gen-javastream
to generate the Java classes from it. It should be fine since
platform includes the source of the proto, and jarjar the generated
classess in the module to avoid conflict with platform.
Bug: 218566849
Test: adb shell incident 3001
adb shell dumpsys netstats --proto
atest CtsIncidentHostTestCases:IncidentdTest#testIncidentReportDumpAuto
Change-Id: I09cae385050e569b1da98ad7de0e226b13ee6895
Merged-In: I09cae385050e569b1da98ad7de0e226b13ee6895
Aaron Huang
commited 2022-03-22 15:07:15 +08:00
dac7e4b84a
Merge changes from topic "QosCallbackException" am: 7a4fcf4ed1 am: 7b83d68aae
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2028285
Change-Id: I4924e84fa8c5aa2b41638fefdad2c2f686e838ef
Sewook Seo
authored and
Automerger Merge Worker
commited 2022-03-19 01:17:09 +00:00
189d7d8b28
Merge changes from topic "QosCallbackException"
...
* changes:
CTS test for QosCallbackException
Expose constructor of Exceptions.
Sewook Seo
authored and
Gerrit Code Review
commited 2022-03-19 00:35:28 +00:00
7a4fcf4ed1
Add a method to create a TAP interface without bringing it up. am: 333d5e52f5 am: bfd75772cd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987455
Change-Id: I4b48bdfcbf491e4f493a606a43039c285df51faf
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-03-18 03:16:24 +00:00
7f279c327d
Expose constructor of Exceptions.
...
Exposing constructor of Exceptions for test purpose.
CTS-Coverage-Bug: 224059548
BUG: 215240597
BUG: 216368595
Test: build
Change-Id: I20af104a891e94873715ab46ecabc3e775638c8c
sewookseo
commited 2022-03-17 18:05:56 +00:00
e7c481452e
Add a method to create a TAP interface without bringing it up.
...
In S, the behaviour of createTunInterface and createTapInterface
changed so that they bring up the interface before returning it.
This makes it difficult to test code that brings interfaces up
itself, such as IpClient or EthernetManager, because the tests
cannot predict whether that code will see the interface up
or not. This leads to flaky tests and can even make it impossible
to reliably test some behaviour.
Add a method that allows the caller to specify whether to bring
up the interface or not.
Test: new codepath tested by other CL in topic
Test: existing codepaths already well-covered
Change-Id: I0f7698f4dad132f201db4203e65a78c6af564ab2
Lorenzo Colitti
authored and
Xiao Ma
commited 2022-03-17 13:42:34 +00:00
333d5e52f5
Merge "Use int array for included and excluded uids" am: 2ccbfe9d8f am: 8b0350f4b6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018920
Change-Id: I73373faabcf62add0703854b3cf8fb35668b197d
Sooraj Sasindran
authored and
Automerger Merge Worker
commited 2022-03-16 18:58:04 +00:00
3f32e9e066
Rename setAccessUids to setAllowedUids
...
Bug: 217725769
Test: ConnectivityServiceTest CtsNetTestCases
Change-Id: Ic8a3f91553d1462b7f54259c467fb90a950bdd59
Merged-In: I8860fbb353eedf5d01e9dc248e4d765046bd562c
Chalard Jean
authored and
Sooraj Sasindran
commited 2022-03-16 17:58:20 +00:00
de665266cd
Merge "Use int array for included and excluded uids"
Sooraj Sasindran
authored and
Gerrit Code Review
commited 2022-03-16 17:56:08 +00:00
2ccbfe9d8f
Merge changes from topic "ethernet_mainline"
...
* changes:
Fix the NPE thrown when starting Ethernet service in OS lower than T.
Remove the stub ethernet service from Connectivity module.
Update hidden API files for EthernetManager API move.
Provide a stub ethernet service to build in sc-mainline-prod.
Build ethernet framework source into framework-connectivity-tiramisu
Patrick Rohr
authored and
Gerrit Code Review
commited 2022-03-16 16:03:30 +00:00
6dde8ac532
Use int array for included and excluded uids
...
Use int array for included and excluded uids so that uses
same data type as in PreferentialNetworkServiceConfig
Bug: 217365439
Test: ran connectivity service unit tests
Change-Id: I9ac7e6498df2fd20b8397b2c110296e019c7389e
Sooraj Sasindran
commited 2022-03-16 07:19:11 +00:00
4904176454
Rename setAccessUids to setAllowedUids
...
Bug: 217725769
Ignore-AOSP-First: Due to dependency on Telephony code which is not in
AOSP
Test: ConnectivityServiceTest CtsNetTestCases
Change-Id: I8860fbb353eedf5d01e9dc248e4d765046bd562c
Chalard Jean
authored and
Sooraj Sasindran
commited 2022-03-16 06:29:27 +00:00
7d72b41c95
Merge "API review: Additional comment for QosSession." am: c8fadc5cde am: 6786ff4984
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018921
Change-Id: I90ee83fd8e68317945238fd8e835a87dfe5851bd
Sewook Seo
authored and
Automerger Merge Worker
commited 2022-03-15 10:58:55 +00:00
585ec3f1e2
Merge "API review: Additional comment for QosSession."
Sewook Seo
authored and
Gerrit Code Review
commited 2022-03-15 10:10:27 +00:00
c8fadc5cde
Merge "Add a NetworkAgent API to indicate that a network will be replaced." am: 9f6e6c4e27 am: 27987f4800
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987457
Change-Id: Ibc7bbc93db260ce5ab2606c077c8d6f5493b09fb
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-03-15 05:37:51 +00:00
fe0b6b8199