Commit Graph

6294 Commits

Author SHA1 Message Date
Lorenzo Colitti
f5773c7279 Merge "Fix API in CaptivePortal and ConnectivityManager" 2019-03-22 11:46:21 +00:00
Lucas Lin
52fda28a8a Merge "Enable PARTIAL_CONNECTIVITY dialog" am: dd7df788e8 am: 7b6be6f338
am: f7d18ebd53

Change-Id: I2ba8244fe582c4194f9d2a60d9562b12d5c8e431
2019-03-22 03:50:47 -07:00
Luke Huang
44e37b74f3 Merge "Support query cancellation for async DNS API" am: fb47755153 am: b899f2b3bc
am: 79de471561

Change-Id: I034361541f64c10d72474beaefdb3547c9c2733e
2019-03-22 03:35:57 -07:00
Remi NGUYEN VAN
65c187466b 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
Lucas Lin
f7d18ebd53 Merge "Enable PARTIAL_CONNECTIVITY dialog" am: dd7df788e8
am: 7b6be6f338

Change-Id: I2e1947cdf6e084aefd4d2ccd7b345df79c62e383
2019-03-21 21:40:39 -07:00
Lucas Lin
7b6be6f338 Merge "Enable PARTIAL_CONNECTIVITY dialog"
am: dd7df788e8

Change-Id: I88ca44ef0c0a7cf48538421022d0fed10d15fc26
2019-03-21 21:30:48 -07:00
Lucas Lin
dd7df788e8 Merge "Enable PARTIAL_CONNECTIVITY dialog" 2019-03-22 04:17:43 +00:00
Luke Huang
79de471561 Merge "Support query cancellation for async DNS API" am: fb47755153
am: b899f2b3bc

Change-Id: I890bbb94bf1b8e2242efeb5c868e289a8ae4a95d
2019-03-21 21:13:29 -07:00
Luke Huang
b899f2b3bc Merge "Support query cancellation for async DNS API"
am: fb47755153

Change-Id: I400d98e13cf36ca16c3743eddee96bfae4b47b5c
2019-03-21 20:50:18 -07:00
Luke Huang
fb47755153 Merge "Support query cancellation for async DNS API" 2019-03-22 03:26:21 +00:00
lucaslin
32ecfc4c59 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
9acc3e21d1 Merge "Fix Automated API Review issues." am: e9109ceb23 am: fa662c4b91
am: 67646b0f22

Change-Id: Iba1630161579571d4975aba9bbd5c767f82c8a98
2019-03-21 11:54:51 -07:00
Paul Hu
67646b0f22 Merge "Fix Automated API Review issues." am: e9109ceb23
am: fa662c4b91

Change-Id: I881ceb928c0cf8663b0de5f2451846bfe39f2090
2019-03-21 11:01:28 -07:00
Paul Hu
fa662c4b91 Merge "Fix Automated API Review issues."
am: e9109ceb23

Change-Id: I9c007c129269a80d9aede31c8980dbd42e9f1f84
2019-03-21 10:46:03 -07:00
Paul Hu
e9109ceb23 Merge "Fix Automated API Review issues." 2019-03-21 17:19:26 +00:00
lucaslin
372cc04dc3 Merge "Temporarily disable flaky test." am: d2ff961201 am: ead65ee6f8
am: c20c0bd4d9

Change-Id: I583ed9aa0e42e864ef0c1e74fbcd9357e093cc25
2019-03-21 08:39:31 -07:00
lucaslin
c20c0bd4d9 Merge "Temporarily disable flaky test." am: d2ff961201
am: ead65ee6f8

Change-Id: Iec5d70ab6e5afff9ce2a633aa5a1316fa94ef9ad
2019-03-21 08:29:50 -07:00
lucaslin
ead65ee6f8 Merge "Temporarily disable flaky test."
am: d2ff961201

Change-Id: I3f2f81a6884ba1ffc212c4da393846a597af831b
2019-03-21 08:19:47 -07:00
Treehugger Robot
d2ff961201 Merge "Temporarily disable flaky test." 2019-03-21 15:04:15 +00:00
Paul Hu
b779656ba8 Merge "Fix Automated API Review issues." am: 8c128c9413 am: 0565167d6b
am: 6c4e6f1153

Change-Id: I1968eb36c2f4fafd33846ec0f91710c665d936e6
2019-03-21 07:49:37 -07:00
Paul Hu
6c4e6f1153 Merge "Fix Automated API Review issues." am: 8c128c9413
am: 0565167d6b

Change-Id: I29f4cb581574f2542d461de6a0939e58bfc88059
2019-03-21 07:33:48 -07:00
Paul Hu
0565167d6b Merge "Fix Automated API Review issues."
am: 8c128c9413

Change-Id: I9cbe7dc166ec066b8785553f31dc32ea0572be8e
2019-03-21 07:24:16 -07:00
Paul Hu
8c128c9413 Merge "Fix Automated API Review issues." 2019-03-21 14:11:36 +00:00
Mark Chien
fc638407f2 Merge "Replace TcpSocketInfo with similar structure" am: 19a71f90e4 am: 192c20eed5
am: bd4c1878c3

Change-Id: I9b51e6905245ada2707ef7498cc1b8e4cb4c69a0
2019-03-21 05:35:15 -07:00
Mark Chien
bd4c1878c3 Merge "Replace TcpSocketInfo with similar structure" am: 19a71f90e4
am: 192c20eed5

Change-Id: I8ce393e01d48d87deefc0ac9e8c041224b6d4bae
2019-03-21 05:24:03 -07:00
Mark Chien
192c20eed5 Merge "Replace TcpSocketInfo with similar structure"
am: 19a71f90e4

Change-Id: I6e3f89a910fc3ab7524da1c5c5b525a72191a4ed
2019-03-21 05:14:45 -07:00
Mark Chien
19a71f90e4 Merge "Replace TcpSocketInfo with similar structure" 2019-03-21 12:02:54 +00:00
lucaslin
0f755c31a5 Temporarily disable flaky test.
Test: None
Bug: 128426024
Change-Id: I6fa12e50decbafe9d934030865c5a8f20d42b86f
2019-03-21 19:14:32 +08:00
Mark Chien
8d05777d90 Merge "Restrict scope of switch Repair Mode" am: c8cd597aed am: 3f413f5fca
am: 19ec8e28b1

Change-Id: Iec6e6ad38e6b960e56c2c0cc389519710f8b7cd7
2019-03-21 00:39:25 -07:00
Mark Chien
19ec8e28b1 Merge "Restrict scope of switch Repair Mode" am: c8cd597aed
am: 3f413f5fca

Change-Id: If23aeef3979ba1ea523a5f86b366f433c616c94f
2019-03-21 00:29:01 -07:00
Mark Chien
3f413f5fca Merge "Restrict scope of switch Repair Mode"
am: c8cd597aed

Change-Id: Ie655ad82d0441aa6ad6fc45a6e63dc2a53338148
2019-03-21 00:18:11 -07:00
paulhu
2a0fccf6ae 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
c8cd597aed Merge "Restrict scope of switch Repair Mode" 2019-03-21 07:02:14 +00:00
Luke Huang
d7a9b23429 Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion" am: cfd6cdf447 am: f3b2546131
am: df6794ca21

Change-Id: Ib6730d87eeebcd82964feeb96d12c09ae652d0d5
2019-03-20 23:40:30 -07:00
Luke Huang
df6794ca21 Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion" am: cfd6cdf447
am: f3b2546131

Change-Id: Idb5909a8a537ae155a985670cfaf4e993ef3d95d
2019-03-20 23:28:53 -07:00
Luke Huang
f3b2546131 Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion"
am: cfd6cdf447

Change-Id: I86ca4cab29099b26f797ef6fce94dbb6f5183b90
2019-03-20 23:18:25 -07:00
Luke Huang
cfd6cdf447 Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion" 2019-03-21 06:01:25 +00:00
paulhu
9bb0480c2a 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
59bab9709f Merge "Improve partial connectivity" am: ce8235772b am: 8f78c70595
am: 7e756a45cd

Change-Id: I25f9d056c26bf947c2e09516da51b627c3da9685
2019-03-20 21:15:34 -07:00
Lucas Lin
7e756a45cd Merge "Improve partial connectivity" am: ce8235772b
am: 8f78c70595

Change-Id: Ie68acfe6e2182588cdd8b70d67651241573b2189
2019-03-20 20:56:16 -07:00
Lucas Lin
8f78c70595 Merge "Improve partial connectivity"
am: ce8235772b

Change-Id: I19c41c88d32643f82531c7afc3d4248ef9b44b53
2019-03-20 20:45:42 -07:00
Lucas Lin
ce8235772b Merge "Improve partial connectivity" 2019-03-21 03:34:30 +00:00
markchien
0fcb07885b 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
f175d40379 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
c5fdf01476 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
f73b95a4d5 [automerger skipped] Merge changes from topic "framework-no-networkstack-aidl" am: 0063d13ca7 am: 6214a4705c
am: 664a133340 -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
277603442d [automerger skipped] Move TcpKeepalivePacketData out of the framework. am: d9d3bced06 am: 8e71306c9e
am: 1ce0f8ef6e -s ours
am skip reason: change_id Ib2805f7fcc516a5f6989c252365d1c95b8042703 with SHA1 ec1fd15589 is in history

Change-Id: I844cf9813437afda3c835b087607a5ef2b38dc42
2019-03-20 03:55:40 -07:00
Lorenzo Colitti
d93e2386b1 [automerger skipped] Stop using netd parcelables in the framework. am: 196fe35040 am: 60a5a9416b
am: 33d91ce93c -s ours
am skip reason: change_id I027d50ba56091f5558f45e6e08f32e5912b2a82a with SHA1 bdcf77e375 is in history

Change-Id: Iafb073f81f528a0bf3ec750a348ea7ada190e245
2019-03-20 03:49:36 -07:00
Lorenzo Colitti
664a133340 Merge changes from topic "framework-no-networkstack-aidl" am: 0063d13ca7
am: 6214a4705c

Change-Id: Ie5e1e5fce574ca993b1ec2a998f49f9201c59b4d
2019-03-20 03:38:52 -07:00
Lorenzo Colitti
1ce0f8ef6e Move TcpKeepalivePacketData out of the framework. am: d9d3bced06
am: 8e71306c9e

Change-Id: I5f90bdf3993c472f5564164e17106d2a59233656
2019-03-20 03:32:50 -07:00