Commit Graph

5543 Commits

Author SHA1 Message Date
markchien
69955497d4 Reduce excess local prefix computations
only recomputing on the LISTEN_ALL callback

Test: - build, flash, booted
      - runtest frameworks-net

bug: 110335330

Change-Id: I606574f1a8a2899ed4688d7d5ec2cbe0f2638a94
2018-10-22 12:37:42 +09:00
Junyu Lai
43d8774f68 Merge "Add tests for the network blocked status change"
am: af0de1a2e9

Change-Id: I0f3f93807d9089239f572c487d791acd7a324a2e
2018-10-19 09:18:38 -07:00
Mike Yu
f9729757f9 Add tests for the network blocked status change
onBlockedStatusChanged is intruduced for network blocked status.
The changes in this patch are:
  - Test onBlockedStatusChanged which tells apps whether the
    network is blocked.
  - Fixed the tests which is affected by the order changed in
    onAvailable.

Test: as follows
    - runtest frameworks-net
    - runtest -x NetworkPolicyManagerServiceTest.java
Bug: 74575553
Change-Id: I383c037ed895ef69c478dc3cff69fb1e27c42845
2018-10-19 19:52:50 +08:00
Mathieu Chartier
96cb6d97e1 Merge "Sleep 1s before force stop and use killBackgroundApp"
am: 2417859fa5

Change-Id: I92d83f16123dd16f68eb0d95d83f9dbabd493d01
2018-10-18 23:52:16 -07:00
Mathieu Chartier
5615adf824 Sleep 1s before force stop and use killBackgroundApp
Leave a bit of time before force stopping the application. This might
help prevent bad numbers.

Call killbackgroundApp after doing force-stop to make sure nothing is
still running.

Bug: 117094510
Bug: 117888316
Test: atest google/perf/app-startup/third-party-apps/cold-dropcache-stable-test
Change-Id: I47792f99b38edf2c40f61cc3f6817d82e6339d12
2018-10-18 22:03:47 +00:00
Sundong Ahn
a1bc1b1331 Merge "Build com.android.media.remotedisplay with java_sdk_library"
am: 1ad4aed0b9

Change-Id: Icb633bd7f8cc0ed932c0aa70ef9dfe475722ada0
2018-10-14 18:48:01 -07:00
Treehugger Robot
1ad4aed0b9 Merge "Build com.android.media.remotedisplay with java_sdk_library" 2018-10-15 01:32:16 +00:00
Neil Fuller
d252f61f66 Merge "Remove explicit dependencies on "core" libraries"
am: 18f9a2c24d

Change-Id: I326380ec0c10f29c09c64f4044a9c79c9ab2648f
2018-10-12 03:12:22 -07:00
Neil Fuller
066ca17372 Remove explicit dependencies on "core" libraries
The dependencies are unnecessary since bouncycastle, okhttp
and conscrypt are included in the "standard libraries".

Test: build
Bug: 113148576
Change-Id: Ic8d15d911decbdd6391db8c1231b845353586a54
2018-10-11 16:57:18 +01:00
Luke Huang
f81dce0f79 Merge "Refactor tetherGetStats by using stable aidl structure"
am: 335253df0f

Change-Id: Ibaefeee3e115cc04163f1b07cdba148f9e9ab3b5
2018-10-10 23:10:10 -07:00
Luke Huang
335253df0f Merge "Refactor tetherGetStats by using stable aidl structure" 2018-10-11 05:58:22 +00:00
Colin Cross
bfff7e2fe8 Merge changes from topic "aapt2-manifest-elements"
am: e75f2f504e

Change-Id: I2cf054f942109e539c2439887078a6e182603456
2018-10-10 16:13:26 -07:00
Treehugger Robot
e75f2f504e Merge changes from topic "aapt2-manifest-elements"
* changes:
  Remove workarounds for b/79755007
  AAPT2: Add the rest of supported manifest elements
  AAPT2: Add supported manifest elements
2018-10-10 22:29:57 +00:00
Yan Yan
47a589c945 Merge changes I10c01f2b,Ie05bc535
am: 277d42a035

Change-Id: I2e55a266f65268ca734c028d4da7add14a281d75
2018-10-05 11:47:12 -07:00
Yan Yan
277d42a035 Merge changes I10c01f2b,Ie05bc535
* changes:
  Check to ensure UDP-encap is used only for IPv4
  Add UDP encapsulation tests for IpSecService.
2018-10-05 17:38:41 +00:00
evitayan
e4259d3e53 Check to ensure UDP-encap is used only for IPv4
This commit checks if UDP-encapsulation is used
for unsupported address family and throws
IllegalArgumentException when it happens.

Bug: 74213459
Test: Tests added in testCreateTransportModeTransformWithEncap
      and testCreateTunnelModeTransformWithEncap.
      Command: runtest frameworks-net
      Verified on taimen.
Change-Id: I10c01f2bad6aca23430849ea9ef6c1eb157ae131
2018-10-04 11:44:00 -07:00
evitayan
0a7d3e3424 Add UDP encapsulation tests for IpSecService.
This commit adds tests to ensure that IpSecService properly
handles UDP-encapsulation transforms correctly.

Bug: 76110065
Test: Added: testCreateTransportModeTransformWithEncap,
             testCreateTunnelModeTransformWithEncap.
      Command: runtest frameworks-net
      Verified on taimen.
Change-Id: Ie05bc5354266806c2d03b0b3d73a4696a89eccf2
2018-10-04 10:37:47 -07:00
Luke Huang
13b79e83aa Refactor tetherGetStats by using stable aidl structure
Use stable aidl structure instead of persistbundle

Test: runtest frameworks-net passes
Test: manual testing of tetherGetStats function works

Change-Id: I6835541d450446ba7993ac9f5b783d34229b79cb
2018-10-04 16:24:44 +08:00
Remi NGUYEN VAN
94b0562628 Merge "Send hostname and MTU options in DHCP ACK/OFFER"
am: 3b12359e4c

Change-Id: I47972e25fd69471aacd52b58ffed67be1e685557
2018-10-03 19:08:34 -07:00
Remi NGUYEN VAN
3b12359e4c Merge "Send hostname and MTU options in DHCP ACK/OFFER" 2018-10-04 01:08:19 +00:00
Neil Fuller
cfc508530d Merge "Remove unnecessary dependency on bouncycastle"
am: 32fb670a0a

Change-Id: I6289757af66978259b49d4b0b648e049a96b25a7
2018-10-03 06:58:20 -07:00
Neil Fuller
32fb670a0a Merge "Remove unnecessary dependency on bouncycastle" 2018-10-03 13:36:02 +00:00
Jayant Chowdhary
a0484ac42f Merge "Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests"
am: 604b0eed1f

Change-Id: I82c3e108ed4d284840358e7f82aaac3a8404453c
2018-10-02 14:01:01 -07:00
Neil Fuller
35297c49f6 Remove unnecessary dependency on bouncycastle
Nothing in this target requires bouncycastle.
Bug: 113148576
Test: build

Change-Id: I6128fca1eca1c6cefe679721a4cf72729d27d6bb
2018-10-02 21:32:36 +01:00
Jayant Chowdhary
604b0eed1f Merge "Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests" 2018-10-02 20:14:37 +00:00
Leif Hendrik Wilden
1bceeaac85 Merge "Allow wifi and ethenet connected at same time."
am: 54d34fe8a7

Change-Id: I7c1d6fdcb7c7ed26e765f52373e20d19b6db7bfc
2018-10-02 10:57:11 -07:00
Treehugger Robot
54d34fe8a7 Merge "Allow wifi and ethenet connected at same time." 2018-10-02 17:09:16 +00:00
Sundong Ahn
881a9872e7 Build com.android.media.remotedisplay with java_sdk_library
com.android.media.remotedisplay is built with java_sdk_library and api
files are added by running "make update-api".
The com.android.media.remotedisplay.xml is removed since it will be made
auto generation by soong when the library is built with java_sdk_library.

Bug:77577799
Test: make -j
Test: make checkapi
Test: adb shell cmd package list libraries |\
      grep com.android.media.remotedisplay
      And check the com.android.media.remotedisplay library

Merged-In: I40e2d5456877a434f7c1ae70b6ec3692db106537
Change-Id: I40e2d5456877a434f7c1ae70b6ec3692db106537
(cherry picked from commit 6e038837be)
2018-10-02 13:35:49 +09:00
Jayant Chowdhary
14aeab6f19 Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests
libbinder and libhwbinder now also depend on libbinderthreadstate. Add
this dependency to LOCAL_JNI_SHARED_LIBS since these libraries need to
be packaged together.

Bug: 110364143

Test: atest FrameworksNetTests
Test: atest FrameworksServiceTests (no new failures)
Test: atest FrameworksUiServiceTests

Change-Id: Ibc63f041b8ee23cc4d0e9d82a508a128104e6025
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2018-10-01 15:18:18 -07:00
Leif Hendrik Wilden
fd30663181 Allow wifi and ethenet connected at same time.
This will improve the user experience on Android TV devices,
see bug for details.

In addition when connecting adb to the device by ethernet
for cts, wifi will not connect, causing lots of tests to fail.
For example:
[CTS7.1]android.net.wifi.cts.WifiInfoTest#testWifiInfoProperties
[CTS7.1]android.net.cts.ConnectivityManagerTest#testConnectivityChanged_
manifestRequestOnlyPreN_shouldReceiveIntent

Use command:settings to put global wifi_data_always_on 1 to enable it.

Bug: 26102779
Test: Manual, CTS.
Change-Id: I711d93061a6bc7164d98a858912f781e1b967406
2018-10-01 09:12:10 -07:00
Chiachang Wang
38acbcdabe Merge "Fix idle timer rule leakage"
am: 9367b9ea4c

Change-Id: I5ac912d121d094b36d46ccca385d5cf319fcb945
2018-09-30 19:57:18 -07:00
Remi NGUYEN VAN
bc3c6b1314 Merge changes I0f997d30,I288ba1f4
am: 53f8591789

Change-Id: I8309074ba0744dee5789a2fe1f3b7e20bb3bc5b9
2018-09-30 19:53:29 -07:00
Chiachang Wang
9367b9ea4c Merge "Fix idle timer rule leakage" 2018-10-01 02:20:23 +00:00
Treehugger Robot
53f8591789 Merge changes I0f997d30,I288ba1f4
* changes:
  Enable new DHCP server by default
  Use new DHCP server in TetheringTest
2018-10-01 02:18:46 +00:00
Remi NGUYEN VAN
f90a92bb7b Send hostname and MTU options in DHCP ACK/OFFER
The hostname option is only sent when requested in the requested
parameters option. This matches current behavior.

Test: with aosp/763982, regression tests now all pass
      atest FrameworksNetTest
Bug: b/109584964
Change-Id: I793173fa893750ddbe72be09f4c2d70e5b285837
2018-10-01 11:01:39 +09:00
Jeff Vander Stoep
89af05bc4c Merge "InetDiagSocketTest: enable UDP unit tests on all devices"
am: 23a73be430

Change-Id: I93dd01a79356771d68ac008e411d348ddeb01652
2018-09-28 18:30:43 -07:00
Treehugger Robot
23a73be430 Merge "InetDiagSocketTest: enable UDP unit tests on all devices" 2018-09-29 00:16:11 +00:00
Jeff Vander Stoep
f5dfad4b88 InetDiagSocketTest: enable UDP unit tests on all devices
Bug: 116849885
Test: atest InetDiagSocketTest
Change-Id: I3b036818cccd0959feb3a93bc722d70e3ef2c4d7
2018-09-28 08:49:41 -07:00
Chiachang Wang
a6093047e4 Fix idle timer rule leakage
Idle timer rule is not cleared as expected if there is a
default network replacement.

Bug:37080406
Test: 1.run frameworks-net
      2.check iptables rule with default network replacement

Change-Id: I6bd29d79e4ca3e8de4b867c4fcb5f81d02ba6de4
2018-09-28 22:42:48 +08:00
Remi NGUYEN VAN
ee1cde53de Merge "Call clearSettingsProvider before and after test"
am: 3868fc30ee

Change-Id: I38cae25353df48851280490d4593e70b49f0e6c0
2018-09-28 07:28:31 -07:00
Treehugger Robot
3868fc30ee Merge "Call clearSettingsProvider before and after test" 2018-09-28 14:06:36 +00:00
Remi NGUYEN VAN
91a1cc111c Call clearSettingsProvider before and after test
FakeSettingsProvider requires this method to be called before and after
use. Without this, the settings value or content provider may be cached
statically, so the test will be affected by code accessing settings
before it is run.

Bug: b/116668105
Test: atest FrameworksNetTests
Change-Id: I1480f3f3bbb17791752582a70327bb5c7c348d7c
2018-09-28 14:46:34 +09:00
Remi NGUYEN VAN
e0d8c0e09e Enable new DHCP server by default
Regression tests pass with aosp/764042.

Test: regression automated tests, manual (verified WiFi, bluetooth
      tethering working).
Bug: b/109584964

Change-Id: I0f997d302a1d85930b24139af76e9b9c9a1b5f78
2018-09-28 12:43:47 +09:00
Remi NGUYEN VAN
f5581f888e Use new DHCP server in TetheringTest
Run most tests with TETHER_ENABLE_LEGACY_DHCP_SERVER set to 0 (will be
the default value). Add one test to verify that the new server is not
started when TETHER_ENABLE_LEGACY_DHCP_SERVER is 1.

Bug: b/109584964
Test: atest FrameworksNetTests
Change-Id: I288ba1f434918e62ff29f7ace00856108c9730f7
2018-09-28 11:34:15 +09:00
Remi NGUYEN VAN
812286cd84 Merge "Don't throw a NPE in SharedLog#e"
am: bc5c593e2e

Change-Id: Ibe40285165474b2d630a68a43ac82b43411f8bfc
2018-09-27 18:29:35 -07:00
Remi NGUYEN VAN
bc5c593e2e Merge "Don't throw a NPE in SharedLog#e" 2018-09-28 01:08:59 +00:00
Calin Juravle
fdbf99782e Merge "Fix trial run in AppLaunch test"
am: 3e83b4cad8

Change-Id: Ia7d8b3d41614dc09c68e4fdae05934c5f1f9e4c7
2018-09-26 21:19:11 -07:00
Remi NGUYEN VAN
f5d65c521c Don't throw a NPE in SharedLog#e
Some DhcpServer error code paths could cause a NPE, when the logError
callback was called without an exception. Allowing SharedLog#e to be
called with a null Throwable is less error-prone.

Bug: b/109584964
Test: atest FrameworksNetTests
Change-Id: Idbcdd330a9d1951b27aaf525aaf12e52e102872c
2018-09-27 12:20:15 +09:00
Treehugger Robot
3e83b4cad8 Merge "Fix trial run in AppLaunch test" 2018-09-27 02:20:30 +00:00
Calin Juravle
f2528b8539 Fix trial run in AppLaunch test
If the app does not exist log an error but do not fail the test.

Test: atest google/test/performance/app-install-startup -v

(cherry-picked from commit 55db8ff9a6)
Merged-In: Idb6f1d0ba3c5bfb6c7985cd84f5aa4e0599c6b59
Change-Id: Idb6f1d0ba3c5bfb6c7985cd84f5aa4e0599c6b59
2018-09-26 14:17:27 -07:00