Paul Hu
c664ed197a
Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 am: 33ec185c5e am: edd5b0f3a8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788
Change-Id: I1d472c9cffaa0c7f35b284b97fa374b03232a7f4
2021-04-12 15:13:48 +00:00
Paul Hu
edd5b0f3a8
Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 am: 33ec185c5e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788
Change-Id: Ib89ecce40b1361b9f74d66d7969035c7b94702e0
2021-04-12 14:46:35 +00:00
Paul Hu
33ec185c5e
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
Chalard Jean
5b2817f17e
Merge changes Ic4500dc8,I32477db5 into sc-dev
...
* changes:
[NS12] Address comments on NS09
[NS11] Fix yieldToBadWifi over the policy scoring
2021-04-12 12:41:17 +00:00
Chalard Jean
282037c2f0
[NS12] Address comments on NS09
...
Test: ConnectivityServiceTest
Fixes: 184507247
Change-Id: Ic4500dc85507fa68538c9ec179ec6eb4f44c5022
2021-04-12 10:20:27 +00:00
Chalard Jean
1fc552984a
[NS11] Fix yieldToBadWifi over the policy scoring
...
This doesn't reactivate the test because it's not yet fixed over int
scoring.
Bug: 184834350
Test: Remove @Ignore and run testAvoidBadWifi
Change-Id: I32477db52eb50faabc499fa68e24ba07577782aa
2021-04-12 10:19:57 +00:00
paulhu
7fafd1827f
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
James Mattis
2066a2dc84
Merge "Adding log history for setOemNetworkPreference()" am: 7fe91d40f1 am: 98b7cc58c6 am: 3842f94fe3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666340
Change-Id: I123342002b462567174960aa30d1bc4727a8cec7
2021-04-09 17:54:44 +00:00
James Mattis
3842f94fe3
Merge "Adding log history for setOemNetworkPreference()" am: 7fe91d40f1 am: 98b7cc58c6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666340
Change-Id: Ibc8b620025d5d61d34034f29e6f50d48f30b9b34
2021-04-09 17:07:33 +00:00
James Mattis
98b7cc58c6
Merge "Adding log history for setOemNetworkPreference()" am: 7fe91d40f1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666340
Change-Id: I8c9faa1652e702b597cff87c7b5f22f859611dba
2021-04-09 16:27:54 +00:00
Remi NGUYEN VAN
43cc2bbfd7
Merge "Add option to make sign-in notification ongoing" into sc-dev
2021-04-09 06:17:17 +00:00
TreeHugger Robot
0ff4f9d2b7
Merge "Add doc for NetworkScore#getLegacyInt" into sc-dev
2021-04-09 04:38:09 +00:00
Remi NGUYEN VAN
31c8eac0a0
Merge "Improve documentation on simulateDataStall" am: faf00d43b9 am: dcd39e81a6 am: 05d12ae637
...
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
a207a75476
Merge "Set ParseException constructors as public" am: 4abe99e563 am: 592ff78b65 am: 9dea9579f6
...
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
2d52a9ddda
Merge "Replace fields with getters in keepalive API" am: bc01e88edc am: 4c1a04c308 am: 2c5dcb4c03
...
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
3a6bbc2559
Merge "Add RequiresPermission to TestNetworkManager" am: 94c8957576 am: 2e4fce8669 am: 5780b3c45f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187
Change-Id: Ifba7b5b88e162caaf7c5393051f867655cf1b9fb
2021-04-09 02:34:17 +00:00
Remi NGUYEN VAN
05d12ae637
Merge "Improve documentation on simulateDataStall" am: faf00d43b9 am: dcd39e81a6
...
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
9dea9579f6
Merge "Set ParseException constructors as public" am: 4abe99e563 am: 592ff78b65
...
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
2c5dcb4c03
Merge "Replace fields with getters in keepalive API" am: bc01e88edc am: 4c1a04c308
...
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
5780b3c45f
Merge "Add RequiresPermission to TestNetworkManager" am: 94c8957576 am: 2e4fce8669
...
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
89eae3bd33
Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: 793d607d75 am: 1474024e59 am: 70c7bba941
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304
Change-Id: I3a64653b1a9cb283ba04d4c5a363d3b44fa7b987
2021-04-09 01:30:00 +00:00
Remi NGUYEN VAN
0eae121e2c
[automerger skipped] Merge "Use String in CaptivePortalData underlying types" am: 4e34417eec am: e9aecbb5d2 am: 19381a5938 -s ours
...
am skip reason: skip tag Change-Id Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97 with SHA-1 5ee45003b4 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
Remi NGUYEN VAN
70c7bba941
Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: 793d607d75 am: 1474024e59
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304
Change-Id: Iaec8ac01bbb518af8e14c0936cf8d8f2f75d8dd4
2021-04-09 01:24:14 +00:00
Remi NGUYEN VAN
19381a5938
Merge "Use String in CaptivePortalData underlying types" am: 4e34417eec am: e9aecbb5d2
...
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
dcd39e81a6
Merge "Improve documentation on simulateDataStall" am: faf00d43b9
...
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
592ff78b65
Merge "Set ParseException constructors as public" am: 4abe99e563
...
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
4c1a04c308
Merge "Replace fields with getters in keepalive API" am: bc01e88edc
...
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
2e4fce8669
Merge "Add RequiresPermission to TestNetworkManager" am: 94c8957576
...
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
1474024e59
Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: 793d607d75
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304
Change-Id: I52e7aaca589eefb385cec78bf4372922d8089018
2021-04-09 01:05:40 +00:00
Remi NGUYEN VAN
e9aecbb5d2
Merge "Use String in CaptivePortalData underlying types" am: 4e34417eec
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997
Change-Id: If054ef1739a273e4a203be44675d3b410784dedf
2021-04-09 01:00:10 +00:00
James Mattis
6e4405f926
Adding log history for setOemNetworkPreference()
...
Adding historical logging for the setOemNetworkPreference() calls. This
will last across reboots.
Bug: 177257940
Bug: 176494815
Test: atest FrameworksNetTests
Change-Id: I4fc35fd58ff741830aa292adc1c559b4279ad8f9
2021-04-08 17:40:06 -07:00
Remi NGUYEN VAN
faf00d43b9
Merge "Improve documentation on simulateDataStall"
2021-04-09 00:21:34 +00:00
Remi NGUYEN VAN
4abe99e563
Merge "Set ParseException constructors as public"
2021-04-09 00:20:33 +00:00
Remi NGUYEN VAN
bc01e88edc
Merge "Replace fields with getters in keepalive API"
2021-04-09 00:20:13 +00:00
Remi NGUYEN VAN
94c8957576
Merge "Add RequiresPermission to TestNetworkManager"
2021-04-09 00:19:51 +00:00
Remi NGUYEN VAN
793d607d75
Merge "Replace IS_DEBUGGABLE with isDebuggable module API"
2021-04-09 00:19:19 +00:00
Remi NGUYEN VAN
df60573aae
Merge "Make service-connectivity APEX-only" into sc-dev
2021-04-09 00:18:35 +00:00
Remi NGUYEN VAN
4e34417eec
Merge "Use String in CaptivePortalData underlying types"
2021-04-09 00:17:59 +00:00
James Mattis
cec6dac976
Merge "Adding OEM Network Preferences for testing" am: 9e1bc22ce5 am: 0cc8a225ac am: 038d68cd1f
...
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
038d68cd1f
Merge "Adding OEM Network Preferences for testing" am: 9e1bc22ce5 am: 0cc8a225ac
...
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
0cc8a225ac
Merge "Adding OEM Network Preferences for testing" am: 9e1bc22ce5
...
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
9e1bc22ce5
Merge "Adding OEM Network Preferences for testing"
2021-04-08 20:51:05 +00:00
Chalard Jean
5dcbdf604a
Add doc for NetworkScore#getLegacyInt
...
Test: comment-only change
Fixes: 184786246
Change-Id: I8306f01f3d247986683e272074047e3ad190f68e
2021-04-08 13:52:40 +00:00
Remi NGUYEN VAN
58df155b9d
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
e0869fbce4
[automerger skipped] Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 77d6e7b0ba am: 9b87bcb32d am: 85d1e0a6e1 -s ours
...
am skip reason: skip tag Change-Id Ie0c540303ba06b8fba029d2b98ae753afb08c963 with SHA-1 f668c3b2b2 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
20ad372472
Merge "Move ACTION_CLEAR_DNS_CACHE to ConnectivityManager" am: ed4117ff40 am: d16a01546f am: f0c991fa6f
...
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
5738b86274
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
Remi NGUYEN VAN
6671f42bef
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
da39ab14ce
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
Remi NGUYEN VAN
f672f1b055
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