Commit Graph

5667 Commits

Author SHA1 Message Date
Yan Yan
01b46f8ffd Merge changes I10c01f2b,Ie05bc535 am: 277d42a035 am: 47a589c945
am: 73d9c32aaa

Change-Id: I074056f861332835adaed32ad7d43ed36667ffa3
2018-10-05 12:35:56 -07: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
TreeHugger Robot
8e78d358ba Merge "Convert native processes memory test to JUnit4 test" 2018-10-05 17:15:18 +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
Ng Zhi An
cf6b343b84 Convert native processes memory test to JUnit4 test
Bug: 117128561
Test: atest native-processes-memory-test
Change-Id: I1bf8abf23b5cb315f45ce2446f001a1fa5ef59f1
2018-10-04 10:06:21 -07:00
Tiger Huang
e91ae63374 Merge "Track focus changes on external displays (2/4)" 2018-10-04 05:58:00 +00:00
Remi NGUYEN VAN
939e83d2ad Merge "Send hostname and MTU options in DHCP ACK/OFFER" am: 3b12359e4c am: 94b0562628
am: 04615b7999

Change-Id: Ibae5f00e85b7f6ff2f62f72f1d5f8bfb3bca9f8e
2018-10-03 19:40:11 -07: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
Kweku Adams
a23c0f09b5 Merge "Initial unit test for DeviceIdleController." 2018-10-03 23:27:30 +00:00
Kweku Adams
00e3a37e1a Initial unit test for DeviceIdleController.
This just tests the standard progression into deep idle mode. Exit
conditions and light idle flow is not tested yet.

Bug: 116512267
Test: atest com.android.server.DeviceIdleControllerTest
Change-Id: I015c10871cd00d7a6be19c0b13fd4b3926c9fdf0
2018-10-03 14:01:27 -07:00
Tiger Huang
1e5b10a217 Track focus changes on external displays (2/4)
Let each DisplayContent has its own focused window and focused app.
This change also moves the last tapped display to the top.

Test: atest ActivityManagerMultiDisplayTests
            ActivityStackSupervisorTests
            ActivityStackTests
            CtsWindowManagerDeviceTestCases
            DisplayContentTests
            PointerCaptureTest
Bug: 111361570
Change-Id: I776cabaeaf41ff4240f504fb1430d3e40892023d
2018-10-04 01:05:49 +08:00
Neil Fuller
d436f03470 Merge "Remove unnecessary dependency on bouncycastle" am: 32fb670a0a am: cfc508530d
am: d9357e7f47

Change-Id: I6531548e8f6e5210526963f28a534d34cf06e67d
2018-10-03 07:22:45 -07: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
d72ccfff3d Merge "Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests" am: 604b0eed1f am: a0484ac42f
am: 0c4fad5e92

Change-Id: I77c35778a14ac8671a87a7a0d2bd2ce77409a363
2018-10-02 15:29:49 -07: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
d538e6b8fb Merge "Allow wifi and ethenet connected at same time." am: 54d34fe8a7 am: 1bceeaac85
am: bf1f2c455e

Change-Id: I36b924ac20ebe58dc2a522509b83a341994ff480
2018-10-02 11:25:36 -07: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
TreeHugger Robot
3d82416e02 Merge changes from topic "am_launch_times"
* changes:
  AM: Update WaitResult parsing logic in AppLaunch
  AM: Use ActivityMetricsLogger to get app launch times
2018-10-02 15:30:52 +00:00
TreeHugger Robot
e84ba87a62 Merge "Build com.android.media.remotedisplay with java_sdk_library" 2018-10-02 04:23:16 +00: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
f4b7c18a4a Merge "Fix idle timer rule leakage" am: 9367b9ea4c am: 38acbcdabe
am: 0c71415f0c

Change-Id: If0a281e2d8457eebaa2e572f70ef881f6e8fdb94
2018-09-30 20:20:17 -07:00
Remi NGUYEN VAN
cc7594fe68 Merge changes I0f997d30,I288ba1f4 am: 53f8591789 am: bc3c6b1314
am: 755c78a8dd

Change-Id: If6773e2c3a09d9967f4767c0512e6746b6b44196
2018-09-30 20:11:13 -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
d972f6a960 Merge "InetDiagSocketTest: enable UDP unit tests on all devices" am: 23a73be430 am: 89af05bc4c
am: 25db19c782

Change-Id: I096fa674997df6213b461469d10debede78d86c8
2018-09-28 21:31:35 -07: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
Vishnu Nair
017cddcbcb AM: Update WaitResult parsing logic in AppLaunch
thisTime is no longer printed out when running am start -W
Remove dependencies with line number when parsing output

Bug: 67683350
Test: atest  google/perf/app-startup/third-party-apps/cold-dropcache-stable-test -v
Test: check applaunch.txt matches test run
Change-Id: Ie39486a1552d1a35c621a4ff67d7043d55a19e10
2018-09-28 15:03:55 -07: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
Remi NGUYEN VAN
6bf1126cc4 Merge "Call clearSettingsProvider before and after test" am: 3868fc30ee am: ee1cde53de
am: 8217d911cc

Change-Id: I42487bdadc12fad135ac65dce0dfd6f77a9b9365
2018-09-28 07:53:08 -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
f1ab478b9d Merge "Don't throw a NPE in SharedLog#e" am: bc5c593e2e am: 812286cd84
am: df7154793b

Change-Id: If78ba5b1852d6c717851d443321f7ff3e9bb4cb2
2018-09-27 18:49:22 -07: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