Commit Graph

5855 Commits

Author SHA1 Message Date
Chalard Jean
c9996fbf4a Merge "Tell the factory it is already serving a request." am: 40f6974c7a
am: 183de75174

Change-Id: I8c89110d3b8d55fb8c516a966f4726d4059a098e
2019-03-12 22:21:24 -07:00
Ian Kasprzak
40088b623f Merge "Temporarily disable flaky test." am: d146d717c7
am: 3bab305ed9

Change-Id: Ice8e6cd6cad901ca937ca0953049c2f9c83548f8
2019-03-12 22:15:44 -07:00
Xiao Ma
3893672a94 Merge "[KA13]: add unit test for exposed TCP socket keepalive API." am: a0b41a33e0
am: c8131b1668

Change-Id: I2a2061df07612a9415528e18c6f741e750127adb
2019-03-12 22:01:06 -07:00
Chalard Jean
183de75174 Merge "Tell the factory it is already serving a request."
am: 40f6974c7a

Change-Id: I4c3948c2e7098668cf881d3f31fda87be1250828
2019-03-12 21:42:18 -07:00
Ian Kasprzak
3bab305ed9 Merge "Temporarily disable flaky test."
am: d146d717c7

Change-Id: Ie482f459c2f8bce40098657daa39efccfdf2bcd3
2019-03-12 21:38:43 -07:00
Xiao Ma
c8131b1668 Merge "[KA13]: add unit test for exposed TCP socket keepalive API."
am: a0b41a33e0

Change-Id: I79fb97913e8b69c525733dcaec59a60ac6b980b6
2019-03-12 21:29:48 -07:00
Chalard Jean
40f6974c7a Merge "Tell the factory it is already serving a request." 2019-03-13 02:07:29 +00:00
Ian Kasprzak
d146d717c7 Merge "Temporarily disable flaky test." 2019-03-13 01:52:21 +00:00
Xiao Ma
a0b41a33e0 Merge "[KA13]: add unit test for exposed TCP socket keepalive API." 2019-03-13 01:13:08 +00:00
Lorenzo Colitti
dc1e7d9bba Temporarily disable flaky test.
Test: None
Bug: 128426024
Change-Id: Id88bf452f41f512703d5831e357d9ba72dc5b911
2019-03-13 09:23:54 +09:00
Chalard Jean
44689aab3b Tell the factory it is already serving a request.
This is a cherry-pick of ag/607226 that has been rebased on
top of four years of changes and with comments addressed.

Gives each factory a serial number and propagates it to every
NetworkAgent so when a score comes back indicating a request is
being handled the factory can account for it properly.

Without this, a new request that's already handled by a network
offered by a factory will not cause an increment of the factorys
ref count. Concretely this results in issues like the RAT icon
not being displayed in spite of the network actually being up
and usable.

This will be ported to AOSP as soon as possible, but immediately
some master-only WiFi tests need to be adjusted with this change
which would not let me submit to AOSP.

Bug: 18637384
Bug: 29030667
Test: manual
Test: atest frameworks/opt/telephony/tests/telephonytests
Test: atest frameworks-net
Test: atest CtsNetTestCases CtsHostsideNetworkTests
Change-Id: I597ac588f76dd507512ff02868fd1310b7e63f7e
Merged-In: I597ac588f76dd507512ff02868fd1310b7e63f7e
2019-03-12 21:47:21 +09:00
Chalard Jean
2224f6110b Merge "[CS] Support "instant failure" from factories" am: 6e6bca7632
am: da8e8e4be0

Change-Id: I2dbee9b36a500ff1140c208997581064dd0b4ef1
2019-03-12 05:35:00 -07:00
Chalard Jean
da8e8e4be0 Merge "[CS] Support "instant failure" from factories"
am: 6e6bca7632

Change-Id: I0c5f2823763857edfc5095686345c764d9be12e1
2019-03-12 05:25:48 -07:00
Chalard Jean
6e6bca7632 Merge "[CS] Support "instant failure" from factories" 2019-03-12 12:04:46 +00:00
Lucas Lin
8a7575af75 Merge "Check if network has partial connectivity" am: e54e1235e6
am: 9ebfc37ff9

Change-Id: I1c552638f576738540dda033f35bd32b011485b5
2019-03-12 01:37:59 -07:00
Xiao Ma
75bbf7157a [KA13]: add unit test for exposed TCP socket keepalive API.
Bug: 123987272
Test: atest FrameworksNetTests
Change-Id: I543d8f00ae539b706592a149981e3e8992999284
2019-03-12 17:30:47 +09:00
Lucas Lin
9ebfc37ff9 Merge "Check if network has partial connectivity"
am: e54e1235e6

Change-Id: I3e94029fe067a1a22acc640a0df6a87720572b94
2019-03-12 01:28:50 -07:00
Lucas Lin
e54e1235e6 Merge "Check if network has partial connectivity" 2019-03-12 08:11:14 +00:00
lucaslin
25a5047d2c Check if network has partial connectivity
In some networks, network validation may only get success
result for http probe but fail result for https probe.
For this kind of network, it may still work at some websites
or apps, but user didn't know about that. In order to fix this
issue, we will check if network has partial connectivity and
notify user to make a choice if they want to use this partial
connectivity or not.

Bug: 113450764
Test: 1. Build pass.
      2. Fake partial connectivity case for testing.
      3. atest FrameworksNetTests
      4. atest NetworkStackTests

Change-Id: I69ed00ac4850904ff708c9fef22e148879a10e92
2019-03-12 07:37:33 +00:00
Junyu Lai
af523a54e4 Merge "Improve keepalive offload documentation and error handling" am: 43b275b281
am: 8896c4a4f5

Change-Id: Iae2c4dfcfa2695a57ed54eb93c64eac54f18cf98
2019-03-11 22:30:39 -07:00
Junyu Lai
8896c4a4f5 Merge "Improve keepalive offload documentation and error handling"
am: 43b275b281

Change-Id: Ia87def27904309d405c39607326a77133632461d
2019-03-11 22:21:27 -07:00
Junyu Lai
43b275b281 Merge "Improve keepalive offload documentation and error handling" 2019-03-12 05:11:50 +00:00
Etan Cohen
06633de8ce [CS] Support "instant failure" from factories
Add a mechanism by which a factory can declare "instant failure" for
a request - which would result in it getting an OnUnavailable()
(even without a timeout).

Factories may only do this iff:
1. They know they are the only factory which may fulfill this
   request (common for transport-specific requests).
2. The know that the request can definitely not be
   fulfilled at any point in the future.

Bug: 31382922
Test: atest ConnectivityServiceTest
Merged-In: I9bce0f4d85fa8cad7f8a9998819f945b778c5ac5
Change-Id: I9bce0f4d85fa8cad7f8a9998819f945b778c5ac5
2019-03-11 16:15:43 -07:00
Chalard Jean
d1b010263a Merge "Add tethering event callback API" am: 0b1754826e
am: cc91523736

Change-Id: I083910feb7abf3f554fd2b8dddbc13a7aed8e27c
2019-03-11 10:36:15 -07:00
Chalard Jean
cc91523736 Merge "Add tethering event callback API"
am: 0b1754826e

Change-Id: Ie38a521abf09e0eb530173508b14aa2acdb9267c
2019-03-11 10:26:28 -07:00
Chalard Jean
0b1754826e Merge "Add tethering event callback API" 2019-03-11 17:04:57 +00:00
Chalard Jean
2429c939f0 Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." am: 9903aea505
am: e2df8e3d63

Change-Id: Iee504061c4b61668990489e70d0dd0b75606d24b
2019-03-11 04:30:54 -07:00
Chalard Jean
e2df8e3d63 Merge "[PT17.5] Revert to booleans for send/not send broadcast constants."
am: 9903aea505

Change-Id: Ib8b991ce89fb94d7f0f8b865a1909f73b0b5be0d
2019-03-11 04:21:36 -07:00
Treehugger Robot
9903aea505 Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." 2019-03-11 11:07:21 +00:00
Chalard Jean
bb4de6cb5b [PT17.5] Revert to booleans for send/not send broadcast constants.
In PT17, for security of the patch these two constants have been
switched from boolean to enum values. While this is nice for making
sure a patch is correct, it's also pretty wasteful. Now that it's
certain that the values of these fields don't matter, they can be
set to logical values (as opposed to reversed as it was the case
before PT17.

Test: runtest
Change-Id: I93a0780e23c2f658687be066dc16f27529baaa86
2019-03-11 15:58:31 +09:00
Sasha Smundak
2d3550e3f3 Merge "Convert tests/**/Android.mk files to Android.bp" am: a95677ded5
am: e4c53585f3

Change-Id: Ia1a6c26f4f786f22763ebde95b238887914951f4
2019-03-08 15:33:18 -08:00
Sasha Smundak
e4c53585f3 Merge "Convert tests/**/Android.mk files to Android.bp"
am: a95677ded5

Change-Id: If96014624542d6c99f7d0841347806954dbd4a42
2019-03-08 15:20:09 -08:00
Treehugger Robot
a95677ded5 Merge "Convert tests/**/Android.mk files to Android.bp" 2019-03-08 22:54:11 +00:00
markchien
a005c999b2 Add tethering event callback API
Provide OnTetheringEventCallback for system app to know
tethering's upstream.

Bug: 125583822
Test: -build, flash, boot
      -atest FrameworksNetTests

Change-Id: I7ca81b27c9b805cc01884509f5b20d9d0a24cd36
Merged-in: I7ca81b27c9b805cc01884509f5b20d9d0a24cd36
2019-03-09 00:35:55 +08:00
Luke Huang
0882684893 Merge "Minor changes to the async DNS query JAVA API" am: e11e530257
am: 67de0767d9

Change-Id: Ib1e317597d33a460e80a4efc63835754c1c1b3c7
2019-03-08 07:56:33 -08:00
Benedict Wong
40f59e9f2d Merge changes Ie66ba631,Ic42c09a3 am: 9c34c48e96
am: 913412df41

Change-Id: I09e9a64907694c8cf517325da088d70e867e77f2
2019-03-08 07:19:17 -08:00
Luke Huang
67de0767d9 Merge "Minor changes to the async DNS query JAVA API"
am: e11e530257

Change-Id: I96e9325c7dd5396f48b25919a104be55fb9b6346
2019-03-08 06:51:48 -08:00
Benedict Wong
913412df41 Merge changes Ie66ba631,Ic42c09a3
am: 9c34c48e96

Change-Id: I5c8a3364f0244c5945be2bbe919aac2dcc4eba66
2019-03-08 06:35:04 -08:00
Luke Huang
e11e530257 Merge "Minor changes to the async DNS query JAVA API" 2019-03-08 03:19:55 +00:00
Varun Anand
53b66bee29 [automerger skipped] Merge "Revert "Update VPN capabilities when its underlying network set is null."" into pi-dev
am: aa7b93b167 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 273f900b3b is in history

Change-Id: I0789a8deb45a949c8734fc317cd3d6d8a452d1d1
2019-03-07 16:21:09 -08:00
Sasha Smundak
168d7631b2 Convert tests/**/Android.mk files to Android.bp
See build/soong/README.md for more information.

Note: tests/ImfTest/Android.mk causes conflict as it hasn't been yet
ported to internal master. Do it later.
Note: the conversion in the following directories has to be done in the
internal master first because of the conflicts:
* tests/ActivityManagerPerfTests
* tests/AppLaunch
* tests/AppLaunchWear
* tests/BackgroundDexOptServiceIntegrationTests
* tests/Camera2Tests/CameraToo
* tests/Camera2Tests/SmartCamera/SimpleCamera
* tests/Compatibility
* tests/Internal
* tests/RcsTests
* tests/ServiceCrashTest
* tests/UsbTests

Bug: 122332340
Test: treehugger
Change-Id: Ie17590c6a96aee5caa80d38092a3de5c1b6efe8d
2019-03-07 16:14:00 -08:00
Benedict Wong
9c34c48e96 Merge changes Ie66ba631,Ic42c09a3
* changes:
  Implement TestNetworkService
  Add shell TestNetworkManager and Service
2019-03-07 23:32:55 +00:00
Mark Chien
e432b14e7a Merge "Fix TetheringEntitlementValueListener related API" am: e2f15a176f
am: 4ccb25bfa3

Change-Id: Id85e5499e15b9b244c212a44ca79587b27c9c016
2019-03-07 05:41:46 -08:00
Mark Chien
4ccb25bfa3 Merge "Fix TetheringEntitlementValueListener related API"
am: e2f15a176f

Change-Id: Idd3a7110c32319b610d5dacad7e3632d759ac887
2019-03-07 05:32:33 -08:00
Mark Chien
e2f15a176f Merge "Fix TetheringEntitlementValueListener related API" 2019-03-07 13:21:53 +00:00
Luke Huang
e083ed951f Minor changes to the async DNS query JAVA API
1. refine the naming in DnsPacket and add more comment
2. add comment in DnsResolver

Test: built, flashed, booted
      atest DnsResolverTest DnsPacketTest

Change-Id: Ib482d079d6823fd1d9bff163427b7aad38374199
2019-03-07 16:40:49 +08:00
junyulai
a0229cbac6 Improve keepalive offload documentation and error handling
Bug: 123987401
Test: atest FrameworksNetTests
Change-Id: Id651cfb743f02b05ca3845af3c393eaf5762bb20
2019-03-07 16:01:30 +08:00
Varun Anand
8ddb8a2d84 Revert "Update VPN capabilities when its underlying network set is null."
This reverts commit 5ffc7e609f.

Bug: 126245192

Reason for revert: This change can lead to a deadlock that was fixed in http://ag/6580635. However, platform PMs think that fixing this is risky enough as this is not a recent problem and has been in the field for 3/4 of the year.

Note: The merged-in tag is used to avoid this change from getting merged into pi-dev-plus-aosp. This is to avoid merge conflicts since we mostly work in aosp/master which merges into pi-dev-plus-aosp.

Change-Id: I3814bcec87efb059f50f00617406501aaeac3b4d
Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed
2019-03-07 06:13:03 +00:00
Brett Chabot
5633b0c200 Merge "Migrate frameworks/base/tests/net/ to androidx.test" am: 216266b524
am: 36e7b25aea

Change-Id: I88b55d65728e366e2ffd1336e28da4a879b2d5a2
2019-03-06 22:01:10 -08:00
Brett Chabot
36e7b25aea Merge "Migrate frameworks/base/tests/net/ to androidx.test"
am: 216266b524

Change-Id: Ic6783d55ba6e6a4009569952b542b2a5a42501fe
2019-03-06 21:51:50 -08:00