Commit graph android_packages_modules_Co.../tests/net/java
Message SHA1
Merge "Remove broken test testRfc6724Sort" am: ac6c768bd6
am: 79e97b7d21

Change-Id: I37aa8acc6beeb1e20b99098b1f9e8d5ef800c4eb

Luke Huang   authored and   android-build-merger   commited 2019-05-27 07:33:33 -07:00
577b90a8ef
Remove broken test testRfc6724Sort
This test is conitnuely fail in cuttlefish.
Lack of ipv6 default route in cuttlefish caused the test failed.
The reason is that the result of rfc6724Sort depends on on the route in system.
It is not good to expect any route should exists, so remove it.

Bug: 133649648
Test: atest DnsUtilsTest
Change-Id: I91f89782b9b989fa1a49e666bb5ce2df3a0dbbf7

Luke Huang   commited 2019-05-27 17:49:32 +08:00
179c33f322
Merge "Clean up for multiple validation result update" am: 7a5b9c2d0a
am: 0d018cdaec

Change-Id: I4424663292c5ad29eb7a888fa6975835721a5d2e

Chiachang Wang   authored and   android-build-merger   commited 2019-05-25 02:53:44 -07:00
9ec2c725c8
Merge "Update multiple validation result to ConnectivityService" am: 5af07137d7
am: a0e9af113c

Change-Id: I243db4c406cca826e803c8035268bc0c6e6e01e2

Chiachang Wang   authored and   android-build-merger   commited 2019-05-23 22:57:18 -07:00
2c593ec776
Clean up for multiple validation result update
This is a follow-up commit for aosp/955431 to update commets
and minor updates in unit test.

Test: atest com.android.server.ConnectivityServiceTest#testCaptivePortalOnPartialConnectivity
Bug: 130683832
Change-Id: I581eae8daeddd2c4c186e7b40e27fef2aaa7ab43

Chiachang Wang   commited 2019-05-24 03:29:56 +00:00
b8d3727aa1
Merge "Update multiple validation result to ConnectivityService"
Chiachang Wang   authored and   Gerrit Code Review   commited 2019-05-24 02:50:54 +00:00
5af07137d7
Merge "[CM] Fix NPE due to unvalidated callback value" am: 62790fbdfe
am: cc65a628eb

Change-Id: I5a6e2e92852f76251e8c1bfcd3c06c6773ec1fe4

Etan Cohen   authored and   android-build-merger   commited 2019-05-23 09:42:00 -07:00
a255662062
[CM] Fix NPE due to unvalidated callback value
Fix flaky test resulting from the above fix.

Bug: 132950880
Test: atest ConnectivityServiceTest
Change-Id: I1ddf3bb016239bf88cdd8843a71dcb5e582e83ac

Etan Cohen   commited 2019-05-23 08:16:20 -07:00
1f1bcb0b68
Merge "Add Rfc6724 style sort for DnsResolver and fix potential bug" am: 7a1133eb44
am: d352f4ca85

Change-Id: Ic356f42b46a3ad170fb01f22d9b3e0b7bf1585d4

Luke Huang   authored and   android-build-merger   commited 2019-05-23 07:23:31 -07:00
387e63d68b
Update multiple validation result to ConnectivityService
Once a network is determined to have partial connectivity, it
cannot go back to full connectivity without a disconnect. This
is because NetworkMonitor can only communicate either
PARTIAL_CONNECTIVITY or VALID, but not both. Thus, multiple
validation results allow ConnectivityService to know the real
network status.

Bug: 129662877
Bug: 130683832
Test: atest FrameworksNetTests
Test: atest NetworkStackTests
Test: atest --generate-new-metrics 50
NetworkStackTests:com.android.server.connectivity.NetworkMonitorTest
Test: Simulate partial connectvitiy
Change-Id: I406c9368617c03a2dd3ab15fb1f6dbf539d7c714

Chiachang Wang   commited 2019-05-23 16:29:30 +08:00
eff1897661
Add Rfc6724 style sort for DnsResolver and fix potential bug
1. pass default network explicitly to fix potential
   mis-sync network problem in DnsResolver#query
2. Add rfc6724 sort and related test
3. DnsResolver do rfc6724 sort before response InetAddress answers
4. move haveIpv* function from DnsResolver to DnsUtils

Bug: 129530368
Test: atest DnsResolverTest DnsUtilsTest
Change-Id: I4efa599c0605f6a9e4ef2dd1a36572c69b3c433f

Luke Huang   commited 2019-05-23 11:23:41 +08:00
26c1cdb19d
Merge "[CM] Fix NPE due to unvalidated callback value" am: 43c1536c6b
am: 51ddc176ab

Change-Id: Idf439c1f6badd715776eaaced1a781b066ba6d37

Etan Cohen   authored and   android-build-merger   commited 2019-05-22 10:44:37 -07:00
2ab18250bb
[CM] Fix NPE due to unvalidated callback value
When unregistering callback due to ON_UNAVAILABLE did not check for
a non-null callback.

Bug: 132950880
Test: atest ConnectivityServiceTest
Change-Id: I8f3322963f322e6690f1403681bf66e8b38b35f8

Etan Cohen   commited 2019-05-22 04:56:09 +00:00
b58e366f2d
Merge "Clean up the permission control code in framework" am: 0e6d2b5f4f
am: 6cb0c1579d

Change-Id: I1af059171c5d80be7abaee636f012f3b55dac2df

Chenbo Feng   authored and   android-build-merger   commited 2019-05-13 11:32:59 -07:00
9313f7adf9
Merge "Clean up the permission control code in framework"
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-05-13 18:04:50 +00:00
0e6d2b5f4f
Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." am: 3bee1cdc4e
am: 82a7e510a5

Change-Id: I1db13a48b59d743482436ecf8a20d7f12edd6e1c

Xiao Ma   authored and   android-build-merger   commited 2019-05-10 08:45:30 -07:00
992b7f79a7
Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest."
Xiao Ma   authored and   Gerrit Code Review   commited 2019-05-10 15:16:33 +00:00
3bee1cdc4e
Merge "Support strict mode private DNS on VPNs that provide Internet." am: 9db77747a6
am: e3950cf24a

Change-Id: I28cc679def7cdd4dc5187e65f4524c3998ebcafc

Chalard Jean   authored and   android-build-merger   commited 2019-05-10 04:33:43 -07:00
c455822846
Merge "Support strict mode private DNS on VPNs that provide Internet."
Chalard Jean   authored and   Gerrit Code Review   commited 2019-05-10 09:39:17 +00:00
9db77747a6
Merge changes Ibcb91105,I0218f367 am: 6a5c545890
am: 278e66a401

Change-Id: Ia667386c1a8949839871a6949d79552d9c8b88f0

Junyu Lai   authored and   android-build-merger   commited 2019-05-10 02:13:34 -07:00
04a972ec05
Clean up the arguments annotation and verify items on IpMemoryStoreTest.
Bug: 131133347
Test: atest FrameworksNetTests
Change-Id: I371e7b637ab1c2671f0378508b06adff174f024d

Xiao Ma   commited 2019-05-10 15:42:33 +09:00
103a7ce029
Merge changes Ibff278a6,If6d537a3 am: 5cb924da73
am: 6c6580aa4f

Change-Id: Ic51f3b32375378ff74bdd54d1f36569b277fc80f

Junyu Lai   authored and   android-build-merger   commited 2019-05-09 23:30:19 -07:00
1e518579a8
Merge changes Ibcb91105,I0218f367
* changes:
  Limit unprivileged keepalives per uid
  Support customization of supported keepalive count per transport

Junyu Lai   authored and   Gerrit Code Review   commited 2019-05-10 05:47:23 +00:00
6a5c545890
Support strict mode private DNS on VPNs that provide Internet.
Currently, strict mode private DNS does not work on VPNs because
NetworkMonitor does not validate VPNs. When a VPN connects, it
immediately transitions to ValidatedState, skipping private DNS
hostname resolution.

This change makes NetworkMonitor perform private DNS hostname
resolution and evaluation even on VPNs.

In order to ensure that the system always immediately switches to
the VPN as soon as it connects, remove the unvalidated penalty
for VPN networks. This ensures that the VPN score is always 101
and the VPN always outscores other networks as soon as it
connects. Previously, it would only outscore other networks
when no-op validation completed.

Bug: 122652057
Test: atest FrameworksNetTests NetworkStackTests
Test: manually ran a VPN with private DNS in strict mode
atest android.net.cts.ConnectivityManagerTest com.android.cts.net.HostsideVpnTests
Change-Id: Iaa78a7edcf23755c89d7b354edbc28d37d74d891

Lorenzo Colitti   commited 2019-05-10 14:30:54 +09:00
2fca7e3cb3
Merge changes Ibff278a6,If6d537a3
* changes:
  Revert "Add NATT keepalive resources and methods into IpSecService"
  Revert "[KA11] Verify fd ownership and allocate resource for NattKeepalive"

Treehugger Robot   authored and   Gerrit Code Review   commited 2019-05-10 01:42:26 +00:00
5cb924da73
Revert "Add NATT keepalive resources and methods into IpSecService"
This reverts commit bdf7048571.

Reason for revert: Adds dependency between IpSecService and
                   ConnectivityService may lead to future deadlock
		   problems. Uses a simpler approach instead,
		   hence the solution is not needed.
		   See aosp/954040.

Change-Id: Ibff278a6eee666cd85dba81c2bed94d568679b02

Junyu Lai   authored and   junyulai   commited 2019-05-10 00:58:18 +08:00
b4864e6c40
Support customization of supported keepalive count per transport
This change specifies the required minimum supported keepalives
in SDK, and allows OEMs to customize supported keepalive count
per network through resource overlay.

Bug: 129371366
Test: 1. m -j doc-comment-check-docs
      2. atest FrameworksNetTests

Change-Id: I0218f3674628c13ead63fc9a873895ba7f113033

junyulai   commited 2019-05-10 00:36:58 +08:00
4dca18aa31
Merge "adopt non-blocking method to obtain the IpMemoryStore service." am: 14b9e8b6d8
am: 042800ead0

Change-Id: If0d43f21710ca31149610d3e6a5f0d7e4acc11a2

Xiao Ma   authored and   android-build-merger   commited 2019-05-09 04:55:13 -07:00
42f6be8b40
Merge "adopt non-blocking method to obtain the IpMemoryStore service."
Xiao Ma   authored and   Gerrit Code Review   commited 2019-05-09 11:30:56 +00:00
14b9e8b6d8
Merge "[CS] Unregister callback as part of onUnavailable dispatch" am: e2ba92c411
am: 477211720f

Change-Id: Ida684c441e7aaedce9a29da071ef5a68403d08b3

Etan Cohen   authored and   android-build-merger   commited 2019-05-08 22:42:55 -07:00
abc0036a8b
Merge "Add IPsec checks for IPSEC_TUNNEL feature" into qt-dev
am: 44d474d7c7

Change-Id: I9bd0fa3958c63a148af98abfe7cc6e4301cf01c2

Lorenzo Colitti   authored and   android-build-merger   commited 2019-05-08 21:20:19 -07:00
65365f4320
[CS] Unregister callback as part of onUnavailable dispatch
The onUnavailable semantics promise that it is equivalent to calling
the unregister callback method. But - it doesn't unregister the callback
allowing it to be reused. Fixed.

Additionally, modified the unregisterNetworkCallback method to not fail
on duplicate unregistration (since a callback could now self
unregister). Instead simply print a log.

Bug: 130651445
Test: atest ConnectivityServiceTest
Change-Id: I4c54b003a733eb0b1e4fd8674ed13081b1bef8e3

Etan Cohen   commited 2019-05-09 02:41:40 +00:00
6cb6599ddd
adopt non-blocking method to obtain the IpMemoryStore service.
Test: atest FrameworksNetTests
Change-Id: I7de4f23370bdf9c9df5e74ed074c794080d93d95

Xiao Ma   commited 2019-05-09 10:39:50 +09:00
afc8845452
Revert "[KA11] Verify fd ownership and allocate resource for NattKeepalive"
This reverts commit 2bb85a0bc0.

Reason for revert: Adds dependency between IpSecService and
                   ConnectivityService may lead to future deadlock
                   problems. Uses a simpler approach instead,
                   hence the solution is not needed.
                   See aosp/954040.

Change-Id: If6d537a39595cf132d3ed81d4eaac6700f5f0ab3

Junyu Lai   authored and   junyulai   commited 2019-05-08 11:44:20 +08:00
d09adf6456
Add IPsec checks for IPSEC_TUNNEL feature
This patch adds checks to ensure that the IPSEC_TUNNEL feature flag is
enabled.

Bug: 117183273
Test: Compiles & tests passing
Change-Id: I2699dda29e1eed139bc6fd1b70071e5ab33cad88

Benedict Wong   commited 2019-05-08 00:11:28 +00:00
d7be3aa1d2
Clean up the permission control code in framework
Delete the unused NetworkManagementService API for set/remove
permissions. Use PERMISSION_NONE to replace NO_PERMISSIONS so the
framework now use the same set of permission constant when communicate
with netd.

Bug: 128944261
Test: PermissionMonitorTest.java

Change-Id: I25224c9576f52d2a0a0bd2182325c7aac7b28eb5

Chenbo Feng   commited 2019-05-07 13:50:25 -07:00
4737299d94
Merge "Add CTS API coverage for APIs which are used by NetworkStack" am: ebf3945e1a
am: 1e6c28a167

Change-Id: Id3f0d1c19a76c7987b69e449203fc50423f5e531

Paul Hu   authored and   android-build-merger   commited 2019-05-01 21:52:29 -07:00
e6a0ed54d3
Merge "Add CTS API coverage for APIs which are used by NetworkStack"
Paul Hu   authored and   Gerrit Code Review   commited 2019-05-02 01:37:26 +00:00
ebf3945e1a
Merge "Add tests for DhcpErrorEvent" into qt-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2019-04-30 11:57:59 +00:00
44bb6d00a7
Add CTS API coverage for APIs which are used by NetworkStack
Change-Id: I4f6c34f3bcfa65e60cf73fc1b7cab2d83c32836a
Bug: 129200003
Bug: 129200292
Bug: 129199996
Bug: 129200261
Bug: 129200513
Bug: 129200316
Bug: 129200589
Bug: 129200181
Bug: 129200669
Bug: 129200504
Bug: 129200478
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases: added tests pass

paulhu   commited 2019-04-30 17:26:24 +08:00
e878a6c64f
Support adding NATT keepalive packet filter
Support adding NATT keepalive packet filter to APF
filter.
Generating APF program will be addressed in another CL.

Bug: 33530442
Test: - atest NetworkStackTests
      - atest FrameworksNetTests

Change-Id: I403cd14ac9aa6b001c4e580abbb33a615931a192
Merged-In: Idaa7238a5c9acdae9f6cff13095ee9436c7c92c8
(cherry picked from commit 038c11d564452c9e08f25119423049339ff93c57)

Mark Chien   authored and   markchien   commited 2019-04-30 11:26:26 +08:00
5de4520591
Merge "Support adding NATT keepalive packet filter" am: 7a571f5be4
am: 04bd7b864c

Change-Id: Idaa7238a5c9acdae9f6cff13095ee9436c7c92c8

Mark Chien   authored and   android-build-merger   commited 2019-04-29 09:34:37 -07:00
621463a0c0
Support adding NATT keepalive packet filter
Support adding NATT keepalive packet filter to APF
filter.
Generating APF program will be addressed in another CL.

Bug: 33530442
Test: - atest NetworkStackTests
      - atest FrameworksNetTests

Change-Id: I4961d5da343d8700600269632787c28112f0f9f1

Aaron Huang   authored and   markchien   commited 2019-04-29 19:33:45 +08:00
df1edb385c
Add tests for DhcpErrorEvent
The tests are run both in unit and CTS tests.
Test: atest FrameworksNetTests NetworkStackTestCases
Bug: 129200175

Change-Id: I78d78dd421cc3ffea774ff5eaa6aa758debc9cf2
Merged-In: I9b65a2eef94567d2b79a9955619938e64906080d
Merged-In: I78d78dd421cc3ffea774ff5eaa6aa758debc9cf2
(cherry picked from commit 9e046d509a37c6f37b4757f1681846cee60cfd5c)

Paul Hu   commited 2019-04-29 01:49:17 +00:00
5e05934c54
Merge "Move more network unit tests to common tests" into qt-dev
Paul Hu   authored and   Android (Google) Code Review   commited 2019-04-29 01:36:42 +00:00
511a7bf235
Make DNS cache lifecycle management explicit
1. ConnectivityService calls netd binder to create/destroy network directly.
2. Call dnsresolver binder to create/destroy cache after create/destroy network.
3. Remove unused network create/destroy methods in NetworkManagementService.

Bug: 129453995
Test: atest FrameworksNetTests

Merged-In: I388e208143c38b89bcbb0589de393250024d59aa
(cherry picked from commit 204ca13e63f063f044ac4ad3b96f08b473fe59df)

Change-Id: I4d3dfd9305b60a724aa2dc38448948d8e710c932

Lorenzo Colitti   authored and   Luke Huang   commited 2019-04-26 02:13:59 +00:00
d44040df36
Merge "Make DNS cache lifecycle management explicit" am: 0ce35a9447
am: f8247f0911

Change-Id: I51cf1b7cfd49d4731d922578e8512a1326ebec63

Lorenzo Colitti   authored and   android-build-merger   commited 2019-04-25 17:50:05 -07:00
e38c9c05d0
Merge "Make DNS cache lifecycle management explicit"
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2019-04-26 00:23:22 +00:00
0ce35a9447
Move more network unit tests to common tests
This adds the moved tests to CTS as well.
The moved unit tests are appropriate for CTS as they test data holder
classes that need to function properly for apps to work.

Test: atest FrameworksNetTests
Test: atest CtsNetTestCases: added tests pass
Bug: 129199900

Change-Id: I895d2b57da658d5bed28ebe128611d5d15835742
Merged-In: I9f708a252ab606b782f5f828dce8c1690c3703bf
Merged-In: I895d2b57da658d5bed28ebe128611d5d15835742
(cherry picked from commit cc21fbd483138771dae04f4d86ab411e2e88e575)

Paul Hu   authored and   paulhu   commited 2019-04-25 23:16:13 +08:00
9ede7e9399
Merge changes from topic "niap-vpn" into qt-dev
* changes:
  Reinstate new VPN uid filtering unit tests
  Revert new tests and PackageManager mock
  Block incoming non-VPN packets to apps under fully-routed VPN

Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2019-04-25 04:23:01 +00:00
f3420c999f