Commit Graph

6152 Commits

Author SHA1 Message Date
Xiao Ma
f352c01bc2 Merge "[KA13]: add unit test for exposed TCP socket keepalive API." am: 87b73b01df am: f4b7872afa
am: 82383d0f6e

Change-Id: Ib2b2474a74e2e84b3bb75c36b518ad48009065af
2019-03-12 22:19:28 -07:00
Xiao Ma
82383d0f6e Merge "[KA13]: add unit test for exposed TCP socket keepalive API." am: 87b73b01df
am: f4b7872afa

Change-Id: I2a2061df07612a9415528e18c6f741e750127adb
2019-03-12 22:01:06 -07:00
Xiao Ma
f4b7872afa Merge "[KA13]: add unit test for exposed TCP socket keepalive API."
am: 87b73b01df

Change-Id: I79fb97913e8b69c525733dcaec59a60ac6b980b6
2019-03-12 21:29:48 -07:00
Xiao Ma
87b73b01df Merge "[KA13]: add unit test for exposed TCP socket keepalive API." 2019-03-13 01:13:08 +00:00
Chalard Jean
265d164ddd [automerger skipped] Merge "[CS] Support "instant failure" from factories" am: dce527fbd6 am: 821d197ce6
am: cd78f5f821 -s ours
am skip reason: change_id I9bce0f4d85fa8cad7f8a9998819f945b778c5ac5 with SHA1 4ad1b9f839 is in history

Change-Id: I8f82d119a7a940b190fecd665e47076404d47fd8
2019-03-12 05:44:42 -07:00
Chalard Jean
cd78f5f821 Merge "[CS] Support "instant failure" from factories" am: dce527fbd6
am: 821d197ce6

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

Change-Id: I0c5f2823763857edfc5095686345c764d9be12e1
2019-03-12 05:25:48 -07:00
Chalard Jean
dce527fbd6 Merge "[CS] Support "instant failure" from factories" 2019-03-12 12:04:46 +00:00
Lucas Lin
1f01518b68 Merge "Check if network has partial connectivity" am: 2d3cc4577a am: 0ea87a4edb
am: 973a569390

Change-Id: Ib6c5ecc8238e1ac237eddcc00802fa5e7c0e24b9
2019-03-12 01:47:25 -07:00
Lucas Lin
973a569390 Merge "Check if network has partial connectivity" am: 2d3cc4577a
am: 0ea87a4edb

Change-Id: I1c552638f576738540dda033f35bd32b011485b5
2019-03-12 01:37:59 -07:00
Xiao Ma
fcd1ab6aaf [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
0ea87a4edb Merge "Check if network has partial connectivity"
am: 2d3cc4577a

Change-Id: I3e94029fe067a1a22acc640a0df6a87720572b94
2019-03-12 01:28:50 -07:00
Lucas Lin
2d3cc4577a Merge "Check if network has partial connectivity" 2019-03-12 08:11:14 +00:00
lucaslin
2240ef679d 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
16f5c7d596 Merge "Improve keepalive offload documentation and error handling" am: a0b880c9e8 am: 4a91c73e67
am: a820236f47

Change-Id: If13af1a50c9bb12c85559c9c7a83d0e861d76d09
2019-03-11 22:40:00 -07:00
Junyu Lai
a820236f47 Merge "Improve keepalive offload documentation and error handling" am: a0b880c9e8
am: 4a91c73e67

Change-Id: Iae2c4dfcfa2695a57ed54eb93c64eac54f18cf98
2019-03-11 22:30:39 -07:00
Junyu Lai
4a91c73e67 Merge "Improve keepalive offload documentation and error handling"
am: a0b880c9e8

Change-Id: Ia87def27904309d405c39607326a77133632461d
2019-03-11 22:21:27 -07:00
Junyu Lai
a0b880c9e8 Merge "Improve keepalive offload documentation and error handling" 2019-03-12 05:11:50 +00:00
Etan Cohen
fbfdd84e7c [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
05613209e6 [automerger skipped] Merge "Add tethering event callback API" am: 80c8a33c95 am: 90fcaac205
am: 3f9278c354 -s ours
am skip reason: change_id I7ca81b27c9b805cc01884509f5b20d9d0a24cd36 with SHA1 20f6eea87c is in history

Change-Id: Id6a807ce24b007384caa23385127e7f6e3093e1a
2019-03-11 11:00:43 -07:00
Chalard Jean
3f9278c354 Merge "Add tethering event callback API" am: 80c8a33c95
am: 90fcaac205

Change-Id: I083910feb7abf3f554fd2b8dddbc13a7aed8e27c
2019-03-11 10:36:15 -07:00
Chalard Jean
90fcaac205 Merge "Add tethering event callback API"
am: 80c8a33c95

Change-Id: Ie38a521abf09e0eb530173508b14aa2acdb9267c
2019-03-11 10:26:28 -07:00
Chalard Jean
80c8a33c95 Merge "Add tethering event callback API" 2019-03-11 17:04:57 +00:00
Chalard Jean
d79cbf03a6 Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." am: 4e9a6e4c53 am: 407b351d68
am: 45a0fc9a1c

Change-Id: I11a1c8daf0355674ea0d9d4d15c6ee95a18e9cf4
2019-03-11 04:40:09 -07:00
Chalard Jean
45a0fc9a1c Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." am: 4e9a6e4c53
am: 407b351d68

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

Change-Id: Ib8b991ce89fb94d7f0f8b865a1909f73b0b5be0d
2019-03-11 04:21:36 -07:00
Treehugger Robot
4e9a6e4c53 Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." 2019-03-11 11:07:21 +00:00
Chalard Jean
2a67906ec5 [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
5be5d2dea9 Merge "Convert tests/**/Android.mk files to Android.bp" am: ef59cd5d8b am: 76cc41871e
am: 20f0da8788

Change-Id: I55c5f273e09a2a0ad53fdd8cb4860f04207c4241
2019-03-09 08:25:50 -08:00
Luke Huang
a3acfe29a9 Merge "Minor changes to the async DNS query JAVA API" am: 06ef4a5bc4 am: 39c58a32d3
am: 6005667ec0

Change-Id: I5ce24db3888c9ac4e05af254aa99aae3abcb7140
2019-03-09 04:33:13 -08:00
Benedict Wong
17ab80fd9d resolve merge conflicts of 7365441fe3 to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia76e345ddda5972b2c00731cd1d73a2c1d41c1db
2019-03-08 23:45:49 +00:00
Sasha Smundak
20f0da8788 Merge "Convert tests/**/Android.mk files to Android.bp" am: ef59cd5d8b
am: 76cc41871e

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

Change-Id: If96014624542d6c99f7d0841347806954dbd4a42
2019-03-08 15:20:09 -08:00
Treehugger Robot
ef59cd5d8b Merge "Convert tests/**/Android.mk files to Android.bp" 2019-03-08 22:54:11 +00:00
markchien
4ef53e8819 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
6005667ec0 Merge "Minor changes to the async DNS query JAVA API" am: 06ef4a5bc4
am: 39c58a32d3

Change-Id: Ib1e317597d33a460e80a4efc63835754c1c1b3c7
2019-03-08 07:56:33 -08:00
Benedict Wong
7365441fe3 Merge changes Ie66ba631,Ic42c09a3 am: 6525e97ea5
am: 3feec059fa

Change-Id: I09e9a64907694c8cf517325da088d70e867e77f2
2019-03-08 07:19:17 -08:00
Luke Huang
39c58a32d3 Merge "Minor changes to the async DNS query JAVA API"
am: 06ef4a5bc4

Change-Id: I96e9325c7dd5396f48b25919a104be55fb9b6346
2019-03-08 06:51:48 -08:00
Benedict Wong
3feec059fa Merge changes Ie66ba631,Ic42c09a3
am: 6525e97ea5

Change-Id: I5c8a3364f0244c5945be2bbe919aac2dcc4eba66
2019-03-08 06:35:04 -08:00
markchien
20f6eea87c 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
2019-03-08 17:28:33 +08:00
Luke Huang
06ef4a5bc4 Merge "Minor changes to the async DNS query JAVA API" 2019-03-08 03:19:55 +00:00
Varun Anand
6ca16039aa [automerger skipped] Merge "Revert "Update VPN capabilities when its underlying network set is null."" into pi-dev am: aa7b93b167 -s ours
am: b3c5bf1be0 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 df56995870 is in history

Change-Id: I0fe32cb678b7ee9b7ac79bd0efa4bdec3598ce8b
2019-03-07 17:17:39 -08:00
Varun Anand
b3c5bf1be0 [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 df56995870 is in history

Change-Id: I0789a8deb45a949c8734fc317cd3d6d8a452d1d1
2019-03-07 16:21:09 -08:00
Sasha Smundak
2e39455210 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
6525e97ea5 Merge changes Ie66ba631,Ic42c09a3
* changes:
  Implement TestNetworkService
  Add shell TestNetworkManager and Service
2019-03-07 23:32:55 +00:00
Mark Chien
f8279fdf25 Merge "Fix TetheringEntitlementValueListener related API" am: cdfb2b941d am: 71894fbf14
am: ae8e49de86

Change-Id: I9a1f7c9fa34b6f1e6104a8e5af4b6957e7aae3eb
2019-03-07 05:51:10 -08:00
Mark Chien
ae8e49de86 Merge "Fix TetheringEntitlementValueListener related API" am: cdfb2b941d
am: 71894fbf14

Change-Id: Id85e5499e15b9b244c212a44ca79587b27c9c016
2019-03-07 05:41:46 -08:00
Mark Chien
71894fbf14 Merge "Fix TetheringEntitlementValueListener related API"
am: cdfb2b941d

Change-Id: Idd3a7110c32319b610d5dacad7e3632d759ac887
2019-03-07 05:32:33 -08:00
Mark Chien
cdfb2b941d Merge "Fix TetheringEntitlementValueListener related API" 2019-03-07 13:21:53 +00:00
Luke Huang
1244835690 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