Commit Graph

6462 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
d1bd2f18e0 [automerger skipped] Merge "Fix API in CaptivePortal and ConnectivityManager" am: 8f4c739827 am: 648de2131b
am: c8acc61655 -s ours
am skip reason: change_id I09545c00af3519dbf141dd5951b28f49e37b3e80 with SHA1 d6d5505edf is in history

Change-Id: I793a60492ba7b63c6dea2937e7fc651a1ab617b9
2019-03-24 20:10:38 -07:00
Remi NGUYEN VAN
afa7a43b17 Merge "Separate NetworkMonitor/framework portal URL"
am: 8ab472e77a

Change-Id: I1926527f7875e459b4d3c84bfcd8b3aac9562cae
2019-03-24 20:02:39 -07:00
Remi NGUYEN VAN
c8acc61655 Merge "Fix API in CaptivePortal and ConnectivityManager" am: 8f4c739827
am: 648de2131b

Change-Id: Ibe9d16bbf1e794eb05166ad9c6bccb3ad5bcae9d
2019-03-24 19:57:01 -07:00
Remi NGUYEN VAN
8ab472e77a Merge "Separate NetworkMonitor/framework portal URL" 2019-03-25 02:50:37 +00:00
Remi NGUYEN VAN
648de2131b Merge "Fix API in CaptivePortal and ConnectivityManager"
am: 8f4c739827

Change-Id: I4cc3c61232c74bafe4eb549c1aba5de20a8bb3ff
2019-03-24 19:46:32 -07:00
Treehugger Robot
8f4c739827 Merge "Fix API in CaptivePortal and ConnectivityManager" 2019-03-25 02:37:28 +00:00
Remi NGUYEN VAN
1fb7cabbfc 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

(already merged in internal as:
I09545c00af3519dbf141dd5951b28f49e37b3e80)

Test: flashed, WiFi and captive portal works
Bug: 128935314
Bug: 128935673
Merged-In: I09545c00af3519dbf141dd5951b28f49e37b3e80
Change-Id: I7395d4a4db6a64398a827692aee1956c011873e5
2019-03-25 01:43:48 +00:00
Varun Anand
a611794dac [automerger skipped] Merge "Revert "Revert "Update VPN capabilities when its underlying network set is null.""" into pi-dev am: 376b30f985 -s ours
am: 816e3114eb -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 df56995870 is in history

Change-Id: Ibe57fcb06756943987e70b7e38e57a07f71de4e6
2019-03-22 12:37:54 -07:00
Varun Anand
347a040c66 [automerger skipped] Revert "Revert "Update VPN capabilities when its underlying network set is null."" am: bf1d84cc4e -s ours
am: 96b3daacc9 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 df56995870 is in history

Change-Id: I020ffc31fb0ef41332df37110bb0a8b01e76c976
2019-03-22 12:06:23 -07:00
Varun Anand
816e3114eb [automerger skipped] Merge "Revert "Revert "Update VPN capabilities when its underlying network set is null.""" into pi-dev
am: 376b30f985 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 df56995870 is in history

Change-Id: I0634f41f9b3be7cc640b31ab3067708f99759831
2019-03-22 12:02:13 -07:00
Varun Anand
dd9a68abc8 [automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev am: 182784fea4 -s ours
am: d9801eced8 -s ours
am skip reason: change_id I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6 with SHA1 45406bff69 is in history

Change-Id: I34c36c55ba985118ffc2210b2e05daab2a0ea8e8
2019-03-22 12:02:12 -07:00
Varun Anand
96b3daacc9 [automerger skipped] Revert "Revert "Update VPN capabilities when its underlying network set is null.""
am: bf1d84cc4e -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 df56995870 is in history

Change-Id: I98242257e569eeac747c0328dfa6381e49e7c0b0
2019-03-22 11:45:16 -07:00
Varun Anand
d9801eced8 [automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev
am: 182784fea4 -s ours
am skip reason: SHA1 182784fea4 skipped by user vaanand

Change-Id: Ieee5f28f6d10b0d2b8a7b3eb0272297f148ef03f
2019-03-22 11:39:41 -07:00
Lorenzo Colitti
0eabf54862 Merge "Fix API in CaptivePortal and ConnectivityManager" 2019-03-22 11:46:21 +00:00
Lucas Lin
c78847af69 Merge "Enable PARTIAL_CONNECTIVITY dialog" am: 07461c335b am: 5bda6d7efc
am: c8487a7265

Change-Id: I2ba8244fe582c4194f9d2a60d9562b12d5c8e431
2019-03-22 03:50:47 -07:00
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