Luke Huang
63c28c2c1c
Merge "Support query cancellation for async DNS API" am: 6aea92f594 am: 697b5a4aab
...
am: 7bc21f13af
Change-Id: I034361541f64c10d72474beaefdb3547c9c2733e
2019-03-22 03:35:57 -07:00
Remi NGUYEN VAN
d6d5505edf
Fix API in CaptivePortal and ConnectivityManager
...
- Remove CaptivePortal constructor from SystemApi. This constructor was
added in Q timeframe and ends up being unnecessary since
CaptivePortal creation was refactored to ConnectivityService because
of visibility issues on ICaptivePortal.
- Rename getAvoidBadWifi to shouldAvoidBadWifi
- Add permission annotation for shouldAvoidBadWifi
Test: flashed, WiFi and captive portal works
Bug: 128935314
Bug: 128935673
(clean cherry-pick of AOSP I7395d4a4db6a64398a827692aee1956c011873e5)
Change-Id: I09545c00af3519dbf141dd5951b28f49e37b3e80
2019-03-22 17:16:52 +09:00
Remi NGUYEN VAN
035f65367b
Separate NetworkMonitor/framework portal URL
...
The framework cannot return URLs used by the updatable NetworkStack,
which may use configurable URLs, changing URLs, or mechanisms not
involving URLs to detect captive portals. NetworkMonitor has already
been using random fallback URLs for a while that do not match the value
returned by ConnectivityManager#getCaptivePortalServerUrl.
With this change, the default value returned by the framework is
configured in framework resources as
config_networkDefaultCaptivePortalServerUrl. NetworkMonitor behavior may
change as it is an updatable component, but the current URL is
configured in NetworkMonitor resources as
config_captive_portal_http_url.
Test: flashed, booted, WiFi and captive portal working
Test: ConnectivityManager#getCaptivePortalServerUrl returns correct
value.
Bug: 127908503
Change-Id: I371dedc5b22efa909d7fd58e1ebe9b8aaced9780
2019-03-22 15:11:14 +09:00
Lucas Lin
c8487a7265
Merge "Enable PARTIAL_CONNECTIVITY dialog" am: 07461c335b
...
am: 5bda6d7efc
Change-Id: I2e1947cdf6e084aefd4d2ccd7b345df79c62e383
2019-03-21 21:40:39 -07:00
Lucas Lin
5bda6d7efc
Merge "Enable PARTIAL_CONNECTIVITY dialog"
...
am: 07461c335b
Change-Id: I88ca44ef0c0a7cf48538421022d0fed10d15fc26
2019-03-21 21:30:48 -07:00
Lucas Lin
07461c335b
Merge "Enable PARTIAL_CONNECTIVITY dialog"
2019-03-22 04:17:43 +00:00
Luke Huang
7bc21f13af
Merge "Support query cancellation for async DNS API" am: 6aea92f594
...
am: 697b5a4aab
Change-Id: I890bbb94bf1b8e2242efeb5c868e289a8ae4a95d
2019-03-21 21:13:29 -07:00
Luke Huang
697b5a4aab
Merge "Support query cancellation for async DNS API"
...
am: 6aea92f594
Change-Id: I400d98e13cf36ca16c3743eddee96bfae4b47b5c
2019-03-21 20:50:18 -07:00
Luke Huang
6aea92f594
Merge "Support query cancellation for async DNS API"
2019-03-22 03:26:21 +00:00
lucaslin
e0118abc5b
Enable PARTIAL_CONNECTIVITY dialog
...
Enable PARTIAL_CONNECTIVITY dialog to complete the function.
Bug: 113450764
Test: 1. Build pass
2. atest FrameworksNetTests
3. atest NetworkStackTests
4. Change captive_portal_https_url to https://invalid.com
to simulate partial connectivity.
Change-Id: I5c9fe7a898d30d2f7f75142c85e73fefc257a147
2019-03-22 09:10:08 +08:00
Paul Hu
2e2bc9c173
Merge "Fix Automated API Review issues." am: acb5eca325 am: f1f3b08982
...
am: affa3f497d
Change-Id: Iba1630161579571d4975aba9bbd5c767f82c8a98
2019-03-21 11:54:51 -07:00
Paul Hu
affa3f497d
Merge "Fix Automated API Review issues." am: acb5eca325
...
am: f1f3b08982
Change-Id: I881ceb928c0cf8663b0de5f2451846bfe39f2090
2019-03-21 11:01:28 -07:00
Paul Hu
f1f3b08982
Merge "Fix Automated API Review issues."
...
am: acb5eca325
Change-Id: I9c007c129269a80d9aede31c8980dbd42e9f1f84
2019-03-21 10:46:03 -07:00
Paul Hu
acb5eca325
Merge "Fix Automated API Review issues."
2019-03-21 17:19:26 +00:00
lucaslin
ea54b7ef6b
Merge "Temporarily disable flaky test." am: a7f5cf3adb am: d7a9e6da54
...
am: 70cb4b5281
Change-Id: I583ed9aa0e42e864ef0c1e74fbcd9357e093cc25
2019-03-21 08:39:31 -07:00
lucaslin
70cb4b5281
Merge "Temporarily disable flaky test." am: a7f5cf3adb
...
am: d7a9e6da54
Change-Id: Iec5d70ab6e5afff9ce2a633aa5a1316fa94ef9ad
2019-03-21 08:29:50 -07:00
lucaslin
d7a9e6da54
Merge "Temporarily disable flaky test."
...
am: a7f5cf3adb
Change-Id: I3f2f81a6884ba1ffc212c4da393846a597af831b
2019-03-21 08:19:47 -07:00
Treehugger Robot
a7f5cf3adb
Merge "Temporarily disable flaky test."
2019-03-21 15:04:15 +00:00
Paul Hu
d387c2abc8
Merge "Fix Automated API Review issues." am: a793b48cf0 am: 9a9dac2b98
...
am: d29d268abe
Change-Id: I1968eb36c2f4fafd33846ec0f91710c665d936e6
2019-03-21 07:49:37 -07:00
Paul Hu
d29d268abe
Merge "Fix Automated API Review issues." am: a793b48cf0
...
am: 9a9dac2b98
Change-Id: I29f4cb581574f2542d461de6a0939e58bfc88059
2019-03-21 07:33:48 -07:00
Paul Hu
9a9dac2b98
Merge "Fix Automated API Review issues."
...
am: a793b48cf0
Change-Id: I9cbe7dc166ec066b8785553f31dc32ea0572be8e
2019-03-21 07:24:16 -07:00
Paul Hu
a793b48cf0
Merge "Fix Automated API Review issues."
2019-03-21 14:11:36 +00:00
Mark Chien
3fd041d2ec
Merge "Replace TcpSocketInfo with similar structure" am: a460377cf9 am: bee0fa077b
...
am: 846e87b170
Change-Id: I9b51e6905245ada2707ef7498cc1b8e4cb4c69a0
2019-03-21 05:35:15 -07:00
Mark Chien
846e87b170
Merge "Replace TcpSocketInfo with similar structure" am: a460377cf9
...
am: bee0fa077b
Change-Id: I8ce393e01d48d87deefc0ac9e8c041224b6d4bae
2019-03-21 05:24:03 -07:00
Mark Chien
bee0fa077b
Merge "Replace TcpSocketInfo with similar structure"
...
am: a460377cf9
Change-Id: I6e3f89a910fc3ab7524da1c5c5b525a72191a4ed
2019-03-21 05:14:45 -07:00
Mark Chien
a460377cf9
Merge "Replace TcpSocketInfo with similar structure"
2019-03-21 12:02:54 +00:00
lucaslin
3bc80ae915
Temporarily disable flaky test.
...
Test: None
Bug: 128426024
Change-Id: I6fa12e50decbafe9d934030865c5a8f20d42b86f
2019-03-21 19:14:32 +08:00
Mark Chien
d28562a810
Merge "Restrict scope of switch Repair Mode" am: 19b1610698 am: 0c27d50a2a
...
am: 0f6cd3fd6a
Change-Id: Iec6e6ad38e6b960e56c2c0cc389519710f8b7cd7
2019-03-21 00:39:25 -07:00
Mark Chien
0f6cd3fd6a
Merge "Restrict scope of switch Repair Mode" am: 19b1610698
...
am: 0c27d50a2a
Change-Id: If23aeef3979ba1ea523a5f86b366f433c616c94f
2019-03-21 00:29:01 -07:00
Mark Chien
0c27d50a2a
Merge "Restrict scope of switch Repair Mode"
...
am: 19b1610698
Change-Id: Ie655ad82d0441aa6ad6fc45a6e63dc2a53338148
2019-03-21 00:18:11 -07:00
paulhu
3806853f94
Fix Automated API Review issues.
...
These API's argument/return value must be marked either @NonNull
or @Nullable.
Bug: 126701148
Bug: 126699090
Bug: 126701058
Bug: 126700772
Bug: 126699941
Bug: 126701299
Bug: 126700007
Bug: 126700900
Test: atest FrameworksNetTests
Change-Id: Id030a9f1116178b96aa3d4614b10969a537b2fc4
2019-03-21 15:16:58 +08:00
Mark Chien
19b1610698
Merge "Restrict scope of switch Repair Mode"
2019-03-21 07:02:14 +00:00
Luke Huang
1f5862ef2a
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion" am: df7d47d182 am: 17745f6602
...
am: 063cfac0f0
Change-Id: Ib6730d87eeebcd82964feeb96d12c09ae652d0d5
2019-03-20 23:40:30 -07:00
Luke Huang
063cfac0f0
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion" am: df7d47d182
...
am: 17745f6602
Change-Id: Idb5909a8a537ae155a985670cfaf4e993ef3d95d
2019-03-20 23:28:53 -07:00
Luke Huang
17745f6602
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion"
...
am: df7d47d182
Change-Id: I86ca4cab29099b26f797ef6fce94dbb6f5183b90
2019-03-20 23:18:25 -07:00
Luke Huang
df7d47d182
Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion"
2019-03-21 06:01:25 +00:00
paulhu
cbbc3db924
Fix Automated API Review issues.
...
1. Some API's argument/return value must be marked either
@NonNull or @Nullable.
2. Change some system APIs to public APIs.
3. Modify the method name
Bug: 126700123
Bug: 126702339
Bug: 126699682
Bug: 118296575
Bug: 126699216
Bug: 126699675
Bug: 126699429
Bug: 126699193
Bug: 123586045
Test: atest FrameworksNetTests
Change-Id: Iaa2832cdcf83758ed0fec81b954a0c63bc5a7bf6
2019-03-21 13:55:37 +08:00
Lucas Lin
5026c330f2
Merge "Improve partial connectivity" am: 8d77a4b813 am: a3ab397e1f
...
am: 4569a46522
Change-Id: I25f9d056c26bf947c2e09516da51b627c3da9685
2019-03-20 21:15:34 -07:00
Lucas Lin
4569a46522
Merge "Improve partial connectivity" am: 8d77a4b813
...
am: a3ab397e1f
Change-Id: Ie68acfe6e2182588cdd8b70d67651241573b2189
2019-03-20 20:56:16 -07:00
Lucas Lin
a3ab397e1f
Merge "Improve partial connectivity"
...
am: 8d77a4b813
Change-Id: I19c41c88d32643f82531c7afc3d4248ef9b44b53
2019-03-20 20:45:42 -07:00
Lucas Lin
8d77a4b813
Merge "Improve partial connectivity"
2019-03-21 03:34:30 +00:00
markchien
458c95b9ff
Replace TcpSocketInfo with similar structure
...
Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable
because their structures are very similar.
bug: 128882321
Test: -build, flash, boot
-FrameworksNetTests
Change-Id: Iafb4031a64ba4775a495c156e2c997d890c6b261
2019-03-20 22:29:48 +08:00
markchien
7f2cd7d5e7
Restrict scope of switch Repair Mode
...
Bug: 123969339
Test: -boot, flash
-atest FrameworksNetTests
Change-Id: Ie0fb685be5f7a2d06544065d67c605d87a19ff2f
2019-03-20 22:20:56 +08:00
Luke Huang
ca5270422a
Cleanup NetworkManagementService for Netd commnads binder migrartion
...
remove dead code used for netd UNIX sokcet
Bug: 65862741
Test: atest NetworkManagementServiceTest FrameworksNetTests
Change-Id: I5db61cb86325b71ac8a8fce7b15dbf569abc5935
2019-03-20 20:02:24 +08:00
Lorenzo Colitti
cee6797b6a
[automerger skipped] Merge changes from topic "framework-no-networkstack-aidl" am: 6505a76d78 am: b02b932f46
...
am: a3acf96920 -s ours
am skip reason: change_id I74531ef11d504b232d4f377532d5e0812dbc88db with SHA1 59d474b3c2 is in history
Change-Id: I694f5e54fba6ddc7a9f486b09ddaeaf54d50e9d1
2019-03-20 04:03:21 -07:00
Lorenzo Colitti
4146c1d2c7
[automerger skipped] Move TcpKeepalivePacketData out of the framework. am: 82f2a72d01 am: 63a7fe7a9b
...
am: 48c1555d3c -s ours
am skip reason: change_id Ib2805f7fcc516a5f6989c252365d1c95b8042703 with SHA1 47002ed0d1 is in history
Change-Id: I844cf9813437afda3c835b087607a5ef2b38dc42
2019-03-20 03:55:40 -07:00
Lorenzo Colitti
023fb4b389
[automerger skipped] Stop using netd parcelables in the framework. am: 15c035c790 am: 1ff78aca03
...
am: cb48b152fa -s ours
am skip reason: change_id I027d50ba56091f5558f45e6e08f32e5912b2a82a with SHA1 86b51bb8a4 is in history
Change-Id: Iafb073f81f528a0bf3ec750a348ea7ada190e245
2019-03-20 03:49:36 -07:00
Lorenzo Colitti
a3acf96920
Merge changes from topic "framework-no-networkstack-aidl" am: 6505a76d78
...
am: b02b932f46
Change-Id: Ie5e1e5fce574ca993b1ec2a998f49f9201c59b4d
2019-03-20 03:38:52 -07:00
Lorenzo Colitti
48c1555d3c
Move TcpKeepalivePacketData out of the framework. am: 82f2a72d01
...
am: 63a7fe7a9b
Change-Id: I5f90bdf3993c472f5564164e17106d2a59233656
2019-03-20 03:32:50 -07:00
Lorenzo Colitti
cb48b152fa
Stop using netd parcelables in the framework. am: 15c035c790
...
am: 1ff78aca03
Change-Id: I5a8e45d669f36dfdc67b9f9533d0ff6a24e8f27c
2019-03-20 03:28:08 -07:00