Remi NGUYEN VAN
202721a5b7
Merge "Use String in CaptivePortalData underlying types" am: 55d93ddb7e am: dae21e8596
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997
Change-Id: I6a1cf633329d2b3cb90a0ea68e946777f9feff89
2021-04-09 01:23:58 +00:00
Remi NGUYEN VAN
b241ce07a9
Merge "Improve documentation on simulateDataStall" am: 3b4f0832bd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669505
Change-Id: Idc8f1f13e8b0553cda6f242b95ea72f79f54b9b5
2021-04-09 01:17:31 +00:00
Remi NGUYEN VAN
7251eb2f0c
Merge "Set ParseException constructors as public" am: a2a324f843
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669051
Change-Id: I418a1682eb64b2b54defa37ce12ffdf5aa805b64
2021-04-09 01:13:41 +00:00
Remi NGUYEN VAN
e5bc9e1aa1
Merge "Replace fields with getters in keepalive API" am: 445fd7e9d9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669345
Change-Id: I339284a9f509d970a8c20f4738e42b25ca05c28c
2021-04-09 01:11:20 +00:00
Remi NGUYEN VAN
6e9d84438c
Merge "Add RequiresPermission to TestNetworkManager" am: 58a22b1d8f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187
Change-Id: I3ea1379e439a1dfda99e9332275ea38efed86f4f
2021-04-09 01:08:42 +00:00
Remi NGUYEN VAN
dae21e8596
Merge "Use String in CaptivePortalData underlying types" am: 55d93ddb7e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997
Change-Id: If054ef1739a273e4a203be44675d3b410784dedf
2021-04-09 01:00:10 +00:00
Chiachang Wang
1091a06338
Make getUid a method on UserHandle itself instead of static
...
This commit addresses the API review feedback that getUid()
will be better to make it be a method on UserHandle itself
rather than a static method.
Update as it is and update the corresponding usages.
Fix: 184735865
Test: make update-api
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I33844309224d84764704255d251fadc8940202ca
2021-04-09 08:33:07 +08:00
Remi NGUYEN VAN
3b4f0832bd
Merge "Improve documentation on simulateDataStall"
2021-04-09 00:21:34 +00:00
Remi NGUYEN VAN
a2a324f843
Merge "Set ParseException constructors as public"
2021-04-09 00:20:33 +00:00
Remi NGUYEN VAN
445fd7e9d9
Merge "Replace fields with getters in keepalive API"
2021-04-09 00:20:13 +00:00
Remi NGUYEN VAN
58a22b1d8f
Merge "Add RequiresPermission to TestNetworkManager"
2021-04-09 00:19:51 +00:00
Remi NGUYEN VAN
7391a9ce21
Merge "Make service-connectivity APEX-only" into sc-dev
2021-04-09 00:18:35 +00:00
Remi NGUYEN VAN
55d93ddb7e
Merge "Use String in CaptivePortalData underlying types"
2021-04-09 00:17:59 +00:00
James Mattis
148043b2a0
Merge "Adding OEM Network Preferences for testing" am: ee638e2670 am: bad8f6262f am: c4c1b9c820
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659163
Change-Id: Ia028efd68ae8ce229c5382dc4798671da9124a5b
2021-04-08 22:58:14 +00:00
James Mattis
c4c1b9c820
Merge "Adding OEM Network Preferences for testing" am: ee638e2670 am: bad8f6262f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659163
Change-Id: I982301cdaf36457d1adecbcda1ffa6457fd3bfab
2021-04-08 22:11:04 +00:00
James Mattis
bad8f6262f
Merge "Adding OEM Network Preferences for testing" am: ee638e2670
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659163
Change-Id: I14a27b3b9e7dad67fe9ca275527926e63d465b9a
2021-04-08 21:29:36 +00:00
James Mattis
ee638e2670
Merge "Adding OEM Network Preferences for testing"
2021-04-08 20:51:05 +00:00
Nucca Chen
1de2901818
Merge "[NFCT.TETHER.11] Test TetherOffloadRule{Add, Remove} and set limit for IPv4" am: 68f6f5fe79 am: f0b3bb6e4e am: 79206b9906
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1563332
Change-Id: If7081b15b97cd737d96788d875f7b895ee609cbf
2021-04-08 15:10:57 +00:00
Nucca Chen
bb68871e68
Merge "[NFCT.TETHER.11] Test TetherOffloadRule{Add, Remove} and set limit for IPv4" am: 68f6f5fe79 am: f0b3bb6e4e am: e37b9272f4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1563332
Change-Id: Ic2ba2e4a30ab135ead6d8bf359df7a541e51f11a
2021-04-08 14:18:02 +00:00
Chalard Jean
ff4e69f2be
Add doc for NetworkScore#getLegacyInt
...
Test: comment-only change
Fixes: 184786246
Change-Id: I8306f01f3d247986683e272074047e3ad190f68e
2021-04-08 13:52:40 +00:00
Nucca Chen
e37b9272f4
Merge "[NFCT.TETHER.11] Test TetherOffloadRule{Add, Remove} and set limit for IPv4" am: 68f6f5fe79 am: f0b3bb6e4e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1563332
Change-Id: I56c1250280473dd1e10693c9cae65e6d2e5e808d
2021-04-08 13:30:30 +00:00
Nucca Chen
79206b9906
Merge "[NFCT.TETHER.11] Test TetherOffloadRule{Add, Remove} and set limit for IPv4" am: 68f6f5fe79 am: f0b3bb6e4e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1563332
Change-Id: I44483470e1213716874dcdb07317f3ddb4c72b9d
2021-04-08 13:30:26 +00:00
Lorenzo Colitti
08b33ff7fb
Cleanups to VPN hostside tests.
...
Use TestableNetworkCallback instead of a hand-rolled class.
Remove unnecessary runWithShellPermissionIdentity around
unregisterNetworkCallback calls.
Bug: 165835257
Test: test-only change
Change-Id: I4557dfc64136f9c0b4bdaa1248c33b13e96ba3ed
2021-04-08 22:09:10 +09:00
Lorenzo Colitti
fd3b95c1f7
Ensure the HostsideVpnTests passes with keyguard locked.
...
The test app used in CtsHostsideNetworkTests already dismisses
the keyguard for its own activity, but that doesn't work for the
VPN tests. This is because as soon as the VPN dialog appears, the
test activity is no longer in the foreground and the keyguard
comes back. As a result, the test cannot click on the VPN dialog.
Test: test-only change
Change-Id: I7be1d7fb46a2f9547bc5325d75b5bd5546e6dc18
2021-04-08 21:50:15 +09:00
Nucca Chen
f0b3bb6e4e
Merge "[NFCT.TETHER.11] Test TetherOffloadRule{Add, Remove} and set limit for IPv4" am: 68f6f5fe79
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1563332
Change-Id: Id5f0d10b07b8fde23d627eaa7058b38512591f98
2021-04-08 12:46:23 +00:00
Lorenzo Colitti
ed26ffe92d
Add CTS tests for registerDefaultNetworkCallbackAsUid.
...
Bug: 165835257
Test: test-only change
Change-Id: Ib3266665735ee587f3f8ae82dadd1e4ca7ce4353
2021-04-08 21:44:30 +09:00
Nucca Chen
68f6f5fe79
Merge "[NFCT.TETHER.11] Test TetherOffloadRule{Add, Remove} and set limit for IPv4"
2021-04-08 12:02:15 +00:00
junyulai
bed32ff530
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
Ignore-AOSP-First: merge conflict with ag/13615939 which cannot
be cherry-picked.
Change-Id: I2dce6035b13472bbdc2609009d690aac96280033
2021-04-08 18:37:26 +08:00
Remi NGUYEN VAN
495d9ba693
Use String in CaptivePortalData underlying types
...
The venue friendly name comes from the network, and only plain strings
should be used in practice. writeCharSequence is also not usable in
CaptivePortalData, as it must build using module_api.
Use a String as the underlying type in CaptivePortalData, keeping
CharSequence in the API for consistency with UI-related elements.
This brings CaptivePortalData in line with downstream branches.
Bug: 183174863
Test: atest FrameworksNetTests
Merged-In: Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97
Change-Id: Ic662d3b546d52f825f9c3a24c5e0d4ba03818ab0
2021-04-08 08:23:20 +00:00
Aaron Huang
44c5e1fb51
[automerger skipped] Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 40a440f0dc am: 26ebda35aa am: ad8412de63 -s ours
...
am skip reason: skip tag Change-Id Ie0c540303ba06b8fba029d2b98ae753afb08c963 with SHA-1 967f77c269 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666841
Change-Id: I5d2e532792b6abf0c35968f136c16a418ad2b380
2021-04-08 07:56:06 +00:00
Paul Hu
324810d572
Merge "Move ACTION_CLEAR_DNS_CACHE to ConnectivityManager" am: ed4117ff40 am: 2cac9e94ba am: 21dbcf362f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667080
Change-Id: I5fd350d67065211b84dbea769d258daff9780276
2021-04-08 07:48:14 +00:00
Remi NGUYEN VAN
564f7f8df3
Improve documentation on simulateDataStall
...
Explain that:
- The method does not cause an actual data stall.
- The detectionMethod parameter refers to
ConnectivityDiagnosticsManager.DataStallReport constants (which
already use an IntDef).
- timestampMillis is relative to SystemClock.elapsedRealtime.
Fixes: 183972768
Test: m
Change-Id: I2eeb79e0e8ec6e8fd3b8fe1dcb1abbf2e6338983
2021-04-08 16:30:25 +09:00
Xiao Ma
171dda09ad
Apply IPv6 utils struct stuff to build RA packet in the Daemon. am: 3e557d777a am: 7f8ae5c99d am: 5d0cec9328
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1614996
Change-Id: Iefef1ce398ab0f65fdf29bca15c8655e64953db0
2021-04-08 07:22:26 +00:00
Xiao Ma
73add1d174
Apply IPv6 utils struct stuff to build RA packet in the Daemon. am: 3e557d777a am: 7f8ae5c99d am: d39b5b9888
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1614996
Change-Id: I9e78b118bb2afdf36fbe28285a927b5d92d9daf6
2021-04-08 07:21:29 +00:00
Remi NGUYEN VAN
c5174c3c10
Add RequiresPermission to TestNetworkManager
...
All API methods in TestNetworkManager require the MANAGE_TEST_NETWORKS
permission.
Fixes: 183972672
Test: m
Change-Id: Ic5929c24ea88d7259d367a81fec8f223a2e3ecb0
2021-04-08 16:12:23 +09:00
Remi NGUYEN VAN
84a217a6ef
Set ParseException constructors as public
...
As there is no strong reason to keep the constructors module-lib, set
them as public API.
This is in response to API feedback.
Fixes: 183446251
Test: m
Change-Id: I01daa6f6f8095f7a4db94d1ca05f913166939df3
2021-04-08 15:57:31 +09:00
Xiao Ma
d39b5b9888
Apply IPv6 utils struct stuff to build RA packet in the Daemon. am: 3e557d777a am: 7f8ae5c99d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1614996
Change-Id: I640b6995bad3fb111bb4bd3e1b2194dac6aea101
2021-04-08 06:35:33 +00:00
Xiao Ma
5d0cec9328
Apply IPv6 utils struct stuff to build RA packet in the Daemon. am: 3e557d777a am: 7f8ae5c99d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1614996
Change-Id: I00b6312bc87f1958c1dae5f99584f93a12f75eae
2021-04-08 06:35:25 +00:00
Treehugger Robot
331b81c651
Merge "Improve RouterAdvertisementDaemonTest." am: 662237f2f8 am: 3b2ad2b764 am: b8aa244e11
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669025
Change-Id: If6f9a6f06c38c75282660334d5b39153c13dbb5b
2021-04-08 05:56:19 +00:00
Xiao Ma
7f8ae5c99d
Apply IPv6 utils struct stuff to build RA packet in the Daemon. am: 3e557d777a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1614996
Change-Id: Id6b170c8743ba3c7449183c9694cce54f0bdf1bf
2021-04-08 05:51:56 +00:00
Remi NGUYEN VAN
a00cc613ac
Add option to make sign-in notification ongoing
...
Add an overlay boolean that allows setting the SIGN_IN notification as
an ongoing notification.
This can be useful to make sure users can always easily find the
notification to sign in to a captive portal, as studies have found that
some users have a tendency to dismiss notifications before reading them.
At the same time the notification shade is generally too crowded, which
is what causes such behaviors in the first place, so this option is not
enabled by default and should generally not be enabled without proper
user studies or metrics.
Bug: 173171709
Test: atest NetworkNotificationManagerTest
Change-Id: Ic187d2a2b7e49ad152ea2aa35bb784864b97473c
2021-04-08 14:42:48 +09:00
Treehugger Robot
3a47a9b55c
Merge "Improve RouterAdvertisementDaemonTest." am: 662237f2f8 am: 3b2ad2b764 am: 5efb849dcf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669025
Change-Id: I210eeb02010c89d3ef37cd79ca4b46e518ebb579
2021-04-08 05:34:19 +00:00
Treehugger Robot
b8aa244e11
Merge "Improve RouterAdvertisementDaemonTest." am: 662237f2f8 am: 3b2ad2b764
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669025
Change-Id: Ica070f535e0599b7729469a518ff550d273fc77a
2021-04-08 05:07:44 +00:00
Treehugger Robot
5efb849dcf
Merge "Improve RouterAdvertisementDaemonTest." am: 662237f2f8 am: 3b2ad2b764
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669025
Change-Id: Ifcf397852832cb8e1550b4a3b933c9872f93cc50
2021-04-08 05:07:35 +00:00
Remi NGUYEN VAN
019b0eef3c
Replace fields with getters in keepalive API
...
General guidance is to have getters in the API instead of fields.
Fixes: 181014882
Test: m
Change-Id: Id4bfc447701e8d0380163047779fbba043f17b6f
2021-04-08 14:06:53 +09:00
Xiao Ma
3e557d777a
Apply IPv6 utils struct stuff to build RA packet in the Daemon.
...
Traffic log of testSolicitRouterAdvertisement:
fe80::4473:4aff:fecb:7799 > ff02::1: ICMP6, router advertisement, length 88
fe80::1122:3344:5566:7788 > ff02::1: ICMP6, router solicitation, length 16
fe80::4473:4aff:fecb:7799 > fe80::1122:3344:5566:7788: ICMP6, router advertisement, length 88
Bug: 154669942
Test: atest TetheringPrivilegedTests --iterations
Change-Id: I7defb80ef9dd1832c9e04d154e1d06aed9e733dc
2021-04-08 04:50:49 +00:00
Treehugger Robot
3b2ad2b764
Merge "Improve RouterAdvertisementDaemonTest." am: 662237f2f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669025
Change-Id: I9e9bb95e095fa1b8d907d56cc0e347746ae9a01c
2021-04-08 04:45:41 +00:00
Treehugger Robot
662237f2f8
Merge "Improve RouterAdvertisementDaemonTest."
2021-04-08 04:07:14 +00:00
Aaron Huang
ad8412de63
Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 40a440f0dc am: 26ebda35aa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666841
Change-Id: Ie3d8de6a1df69231367c8d476a158070d21f7f91
2021-04-08 03:00:27 +00:00
Aaron Huang
26ebda35aa
Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 40a440f0dc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666841
Change-Id: I3770e6f3b146c47fa5b20dcd09e2bbd0fd69cbdf
2021-04-08 02:43:55 +00:00