Lorenzo Colitti
0a250d57b5
Fix a tethering crash when a 464xlat upstream disconnects. am: a329e8c984 am: dadc2fe3bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671533
Change-Id: I7fa106c720d267c407ea1b9a94b1af8eb02aa1dd
2021-04-12 16:15:06 +00:00
Lorenzo Colitti
dadc2fe3bb
Fix a tethering crash when a 464xlat upstream disconnects. am: a329e8c984
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671533
Change-Id: I985db044174ea0bb96c8ca588b380f0c11c0c48c
2021-04-12 15:32:50 +00:00
Chiachang Wang
e2239bc4b2
Merge "Rename APIs in NetworkAgentConfig.Builder" am: f212a922e9 am: 3786083176 am: d811a2671d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047
Change-Id: I1988750dd4b65a3d74c33c8fc120bb3bcb705320
2021-04-12 15:14:26 +00:00
Paul Hu
f63d85dc00
Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 am: a69d2280fc am: 89edca00d1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788
Change-Id: I1d472c9cffaa0c7f35b284b97fa374b03232a7f4
2021-04-12 15:13:48 +00:00
Lorenzo Colitti
a329e8c984
Fix a tethering crash when a 464xlat upstream disconnects.
...
When a 464xlat upstream disconnects, onLinkPropertiesChanged is
called after onLost. This breaks an UpstreamNetworkMonitor
assumption that no callback will ever arrive after onLost.
Bug: 173068192
Fix: 185117377
Test: new unit test
Change-Id: I4ff1eca6d5ed1680ff716c71b683891c8a0e5a77
2021-04-12 15:00:24 +00:00
Chiachang Wang
d811a2671d
Merge "Rename APIs in NetworkAgentConfig.Builder" am: f212a922e9 am: 3786083176
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047
Change-Id: Ia16a26e64e65687faf6303c392c4a85de52129e3
2021-04-12 14:47:46 +00:00
Paul Hu
89edca00d1
Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 am: a69d2280fc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788
Change-Id: Ib89ecce40b1361b9f74d66d7969035c7b94702e0
2021-04-12 14:46:35 +00:00
Chiachang Wang
3786083176
Merge "Rename APIs in NetworkAgentConfig.Builder" am: f212a922e9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047
Change-Id: Ia437814497ef603043980c37add9e2ddfccf11c9
2021-04-12 14:25:01 +00:00
Chiachang Wang
f212a922e9
Merge "Rename APIs in NetworkAgentConfig.Builder"
2021-04-12 14:10:46 +00:00
Paul Hu
a69d2280fc
Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788
Change-Id: Ie2f0463dd064ad7363054a5c08b6e09b54eea6cb
2021-04-12 14:04:27 +00:00
Chiachang Wang
a31a9b6218
Update the method based on API feedback
...
UserHandle.getUid() is updated to a non-static API based on API
review feedback. Update the usage accordingly.
Bug: 184735865
Test: atest VpnTest
Change-Id: I884f427fae85b2b26973a0315b1ccf3d6f0824c6
2021-04-12 19:35:56 +08:00
Chiachang Wang
f5324d7d03
Rename APIs in NetworkAgentConfig.Builder
...
As API review feedback, rename disableProvisioningNotification()
to setEnabledProvisioningNotification and disableNat64Detection()
to setEnabledNat64Detection. Also, update code in caller side
accordingly.
Bug: 184735772
Test: make update-api ; atest FrameworksNetTests
Change-Id: If7305634863d1503c967e5593ebd0c8af2174bea
2021-04-12 17:27:47 +08:00
paulhu
c3663377e7
Remove TcpRepairWindow from module-lib API
...
Both TcpRepairWindow and TcpKeepaliveController(user) are in the
connectivity module, so TcpRepairWindow doesn't need to be
the module-lib API. Thus, remove TcpRepairWindow from
module-lib API.
Bug: 172183305
Test: m update-api
Change-Id: I8fde726f8ad73637e6deab69ea83b3699bb2cf45
2021-04-12 14:26:55 +08:00
paulhu
e0f3796bbb
Replace FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT in Connectivity
...
Replace all FIRST_SDK_INT usage in Connectivity because it has
been renamed to DEVICE_INITIAL_SDK_INT.
Bug: 184735771
Test: m CtsNetTestCases
Ignore-AOSP-First: Some files are differnet between aosp and
sc-dev on frameworkrs/base.
Change-Id: I2f155592b08cdbf259a00b035cacb37ca9847e72
2021-04-12 01:55:33 +00:00
Lorenzo Colitti
e833a4cc63
Merge changes from topic "peruidcallback-cts" am: 65bba3f6bc am: ab98c8119d am: 5ea615e08c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669609
Change-Id: I56ff93b1d629b94e59d279b96066700703e2db05
2021-04-09 17:32:47 +00:00
Lorenzo Colitti
ad150c460c
Ensure the HostsideVpnTests passes with keyguard locked. am: fd3b95c1f7 am: 16d841048e am: 8a92d39274
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669608
Change-Id: Ieb31c289e72837bcd602d04a6317c6203402daa0
2021-04-09 17:32:47 +00:00
Lorenzo Colitti
d9096739e3
Add CTS tests for registerDefaultNetworkCallbackAsUid. am: ed26ffe92d am: 6cbdc19b2c am: 2bc9317761
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669267
Change-Id: I3285145c5ba6466135c7021ed0e9043c69373ec0
2021-04-09 17:32:45 +00:00
Lorenzo Colitti
c7f7f5ada8
Merge changes from topic "peruidcallback-cts" am: 65bba3f6bc am: ab98c8119d am: 89d260c039
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669609
Change-Id: I0a28ee62a63c4db0494cc51f69ab0b8468401f85
2021-04-09 17:12:08 +00:00
Lorenzo Colitti
a42e82e17f
Ensure the HostsideVpnTests passes with keyguard locked. am: fd3b95c1f7 am: 16d841048e am: a8f8011851
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669608
Change-Id: I707386cd46c2070762d50254629829173be80510
2021-04-09 17:12:08 +00:00
Lorenzo Colitti
02e2380c8a
Add CTS tests for registerDefaultNetworkCallbackAsUid. am: ed26ffe92d am: 6cbdc19b2c am: 97384c0121
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669267
Change-Id: If16f7076f47acec463cb288f5a88c0cb7ee6de03
2021-04-09 17:12:07 +00:00
Lorenzo Colitti
5ea615e08c
Merge changes from topic "peruidcallback-cts" am: 65bba3f6bc am: ab98c8119d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669609
Change-Id: I556be793ee14d557ee1442287b47c9a1edcaad0d
2021-04-09 16:45:47 +00:00
Lorenzo Colitti
8a92d39274
Ensure the HostsideVpnTests passes with keyguard locked. am: fd3b95c1f7 am: 16d841048e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669608
Change-Id: I122298ef532c8a41821ead6bb07595e1412ce1e9
2021-04-09 16:45:47 +00:00
Lorenzo Colitti
2bc9317761
Add CTS tests for registerDefaultNetworkCallbackAsUid. am: ed26ffe92d am: 6cbdc19b2c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669267
Change-Id: Icca5c5a62818ac83910e968dbbadd0610305aa0b
2021-04-09 16:45:46 +00:00
Lorenzo Colitti
89d260c039
Merge changes from topic "peruidcallback-cts" am: 65bba3f6bc am: ab98c8119d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669609
Change-Id: Ifbd2f1615f9db9c499edc7d75d2bc3865043e1dc
2021-04-09 16:45:30 +00:00
Lorenzo Colitti
a8f8011851
Ensure the HostsideVpnTests passes with keyguard locked. am: fd3b95c1f7 am: 16d841048e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669608
Change-Id: I689f8a5e5028069753d377979eee14f97e611681
2021-04-09 16:45:29 +00:00
Lorenzo Colitti
97384c0121
Add CTS tests for registerDefaultNetworkCallbackAsUid. am: ed26ffe92d am: 6cbdc19b2c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669267
Change-Id: I6983acf968da429a0c036aa7e13a406f27ba7278
2021-04-09 16:45:27 +00:00
Lorenzo Colitti
ab98c8119d
Merge changes from topic "peruidcallback-cts" am: 65bba3f6bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669609
Change-Id: Ic9d3ef957feb979142d7b0adb3ec9525e432eb14
2021-04-09 15:59:16 +00:00
Lorenzo Colitti
16d841048e
Ensure the HostsideVpnTests passes with keyguard locked. am: fd3b95c1f7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669608
Change-Id: Idabf4f50d54116d80dc349564bd9ab04cc7fd21a
2021-04-09 15:59:15 +00:00
Lorenzo Colitti
6cbdc19b2c
Add CTS tests for registerDefaultNetworkCallbackAsUid. am: ed26ffe92d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669267
Change-Id: Id8d968130a52d419c65a628fb93e47e5ac48c81e
2021-04-09 15:59:13 +00:00
Lorenzo Colitti
65bba3f6bc
Merge changes from topic "peruidcallback-cts"
...
* changes:
Cleanups to VPN hostside tests.
Ensure the HostsideVpnTests passes with keyguard locked.
Add CTS tests for registerDefaultNetworkCallbackAsUid.
2021-04-09 15:16:47 +00:00
TreeHugger Robot
1f3a487326
Merge "Add back platform APIs to HostsideNetworkTestsApp" into sc-dev
2021-04-09 14:41:25 +00:00
junyulai
1bb82d79da
[automerger skipped] Fix NetworkCallback expecting wrong network am: 2e74377464 am: cfd7518bdc am: 2ece9db0de -s ours
...
am skip reason: skip tag Change-Id I2dce6035b13472bbdc2609009d690aac96280033 with SHA-1 bed32ff530 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1657299
Change-Id: I04016f6a01ff50ec00180f0277a0997f3ca0ab6d
2021-04-09 11:21:17 +00:00
junyulai
d92fd2aef5
[automerger skipped] Fix NetworkCallback expecting wrong network am: 2e74377464 am: cfd7518bdc am: 74e03eb201 -s ours
...
am skip reason: skip tag Change-Id I2dce6035b13472bbdc2609009d690aac96280033 with SHA-1 bed32ff530 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1657299
Change-Id: I9f7eccc134467ff3ba31a6b62c95f7735727e943
2021-04-09 11:00:58 +00:00
junyulai
74e03eb201
Fix NetworkCallback expecting wrong network am: 2e74377464 am: cfd7518bdc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1657299
Change-Id: I4a04b1c4d0e761024a0a7506c7fcf32020413c4b
2021-04-09 09:38:43 +00:00
junyulai
2ece9db0de
Fix NetworkCallback expecting wrong network am: 2e74377464 am: cfd7518bdc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1657299
Change-Id: I9f14fae14fcb7ed5b2e63b067e8ea14404b484a2
2021-04-09 09:38:26 +00:00
junyulai
cfd7518bdc
Fix NetworkCallback expecting wrong network am: 2e74377464
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1657299
Change-Id: Ia3e24d519ab7101e9cd1be7ec18f1ba7f7fff7e9
2021-04-09 08:53:47 +00:00
Remi NGUYEN VAN
a9dfa785a2
Merge "Add option to make sign-in notification ongoing" into sc-dev
2021-04-09 06:17:17 +00:00
Remi NGUYEN VAN
0b137cb1aa
Add back platform APIs to HostsideNetworkTestsApp
...
The "platform_apis: true" clause was removed by mistake and is actually
necessary.
Ignore-AOSP-First: original change not in AOSP
Fixes: 184844380
Test: atest HostsideVpnTests
Change-Id: I32bd4a7057a3eb167975fe9f51f1bc0d056c44a0
2021-04-09 04:51:16 +00:00
TreeHugger Robot
d9c09ee7cb
Merge "Add doc for NetworkScore#getLegacyInt" into sc-dev
2021-04-09 04:38:09 +00:00
Remi NGUYEN VAN
cb7360eecb
Merge "Improve documentation on simulateDataStall" am: 3b4f0832bd am: b241ce07a9 am: 3c5cdf0dbc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669505
Change-Id: I9484583b0249f4f67fdf6216f9ca72b900320699
2021-04-09 02:36:41 +00:00
Remi NGUYEN VAN
6a0e0809b4
Merge "Set ParseException constructors as public" am: a2a324f843 am: 7251eb2f0c am: 352fc488f2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669051
Change-Id: I7b744bdacf5e5929a1d0ac60832a355ebe8ce9a9
2021-04-09 02:35:43 +00:00
Remi NGUYEN VAN
e09cf913ca
Merge "Replace fields with getters in keepalive API" am: 445fd7e9d9 am: e5bc9e1aa1 am: bec77cd512
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669345
Change-Id: I73f6f89eb2d1255743d10c1ec1c92770845bdd63
2021-04-09 02:34:59 +00:00
Remi NGUYEN VAN
a4ad1df2da
Merge "Add RequiresPermission to TestNetworkManager" am: 58a22b1d8f am: 6e9d84438c am: e58f448568
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187
Change-Id: Ifba7b5b88e162caaf7c5393051f867655cf1b9fb
2021-04-09 02:34:17 +00:00
junyulai
2e74377464
Fix NetworkCallback expecting wrong network
...
By current wifi design, wifi will report disconnected and
re-connected when changing from non-metered to metered.
However, the cts test app listens for all network, which
will get mobile network as active network when wifi is
changing meteredness. This is not expected. And causes
test failures when DUT has both wifi and mobile connections.
Thus, this change pass request to track currently active
network to the test app and register only for transport
types of currently active network to prevent from getting
unexpected network.
Test: atest CtsHostsideNetworkTests:com.android.cts.net.HostsideNetworkCallbackTests
Bug: 182516128
Merged-In: I2dce6035b13472bbdc2609009d690aac96280033
Change-Id: I2dce6035b13472bbdc2609009d690aac96280033
(cherry-picked from ag/14029457)
2021-04-09 10:16:18 +08:00
Junyu Lai
3ec79f9919
Merge "Fix NetworkCallback expecting wrong network" into sc-dev
2021-04-09 02:06:50 +00:00
Remi NGUYEN VAN
3c5cdf0dbc
Merge "Improve documentation on simulateDataStall" am: 3b4f0832bd am: b241ce07a9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669505
Change-Id: Ia0f2e417d06fac1695929e995b1e7c09b82a24da
2021-04-09 01:48:09 +00:00
Remi NGUYEN VAN
352fc488f2
Merge "Set ParseException constructors as public" am: a2a324f843 am: 7251eb2f0c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669051
Change-Id: I07fa3e87f4faff89f35b6a3500d3ccf0f5a10e94
2021-04-09 01:47:41 +00:00
Remi NGUYEN VAN
bec77cd512
Merge "Replace fields with getters in keepalive API" am: 445fd7e9d9 am: e5bc9e1aa1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669345
Change-Id: I1cf5e79229e5ffda0a77ac65b552ba0875b347f3
2021-04-09 01:47:22 +00:00
Remi NGUYEN VAN
e58f448568
Merge "Add RequiresPermission to TestNetworkManager" am: 58a22b1d8f am: 6e9d84438c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187
Change-Id: I8208c38f4c7a81a1217cc8aeca78374171eae69a
2021-04-09 01:46:43 +00:00
Remi NGUYEN VAN
691ba0b6c3
[automerger skipped] Merge "Use String in CaptivePortalData underlying types" am: 55d93ddb7e am: dae21e8596 am: 202721a5b7 -s ours
...
am skip reason: skip tag Change-Id Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97 with SHA-1 60372ff53d is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997
Change-Id: I5bf71b3f1f938d06eae5c3739af081d49ea3777b
2021-04-09 01:29:27 +00:00