Commit Graph

7340 Commits

Author SHA1 Message Date
Chalard Jean
b38ec9b059 Merge "Opportunistic cleanup" am: 493f8c38bf
am: e0322987da

Change-Id: I467dd780d1ca25ae53f3205288ec1797451a80bf
2019-10-02 12:55:37 -07:00
Chalard Jean
e0322987da Merge "Opportunistic cleanup"
am: 493f8c38bf

Change-Id: I5ac4ae5f941e741a88c595ae5f12b804a758abe6
2019-09-30 22:38:25 -07:00
Chalard Jean
493f8c38bf Merge "Opportunistic cleanup" 2019-10-01 05:25:57 +00:00
Chalard Jean
bb3e64fdc5 Opportunistic cleanup
Test: FrameworksNetTests NetworkStackTests
Change-Id: I370ad15fb0d8301f9720caf5296365c04aebeb62
2019-09-30 19:12:25 +09:00
Lorenzo Colitti
90fef6a390 Merge "Properly test TrafficController permissions on package updates." am: 038d906ac8
am: 9b5daf2034

Change-Id: I9be962d0d9fcf4697ef2998055247186b466470a
2019-09-26 22:55:47 -07:00
Lorenzo Colitti
9b5daf2034 Merge "Properly test TrafficController permissions on package updates."
am: 038d906ac8

Change-Id: Ia6d480739fadaa7b3277d9b6e9abc303b8e551b4
2019-09-26 22:48:57 -07:00
Treehugger Robot
038d906ac8 Merge "Properly test TrafficController permissions on package updates." 2019-09-27 05:35:25 +00:00
Chalard Jean
b7f60d5992 Merge "Fix TestNetworkAgentWrapper flakiness" am: 9f0dc317cc
am: 1f31fe7f98

Change-Id: I281e0f6f4f11c88107d67446fb14d1fa2244ebbb
2019-09-25 02:23:14 -07:00
Chalard Jean
1f31fe7f98 Merge "Fix TestNetworkAgentWrapper flakiness"
am: 9f0dc317cc

Change-Id: I7a20018464b1df7399fd093d2b3259aeb0bca194
2019-09-25 02:16:15 -07:00
Chalard Jean
9f0dc317cc Merge "Fix TestNetworkAgentWrapper flakiness" 2019-09-25 08:58:34 +00:00
Oscar Shu
08eb639ef6 Merge "Followup to CL 1103896" am: e4713e7f18
am: f59fb89406

Change-Id: I7625bcd13f7ce9064e71645d21af39e8034d1a11
2019-09-24 15:41:00 -07:00
Oscar Shu
f59fb89406 Merge "Followup to CL 1103896"
am: e4713e7f18

Change-Id: I1eb784a8266880260d75ca109c7d78f180333a0e
2019-09-24 15:28:23 -07:00
Oscar Shu
e4713e7f18 Merge "Followup to CL 1103896" 2019-09-24 22:06:27 +00:00
xshu
6aa877983e Followup to CL 1103896
Optimizes the logic that ensures the default randomized MAC is not
returned.

Bug: 137796328
Test: atest MacAddressTest
Change-Id: Ie95d7a020bfac8850b8a67e4d396de77db22e1db
2019-09-20 16:56:54 -07:00
Chalard Jean
4e9ecc6f34 Fix TestNetworkAgentWrapper flakiness
The underlying issue here is that before aosp/986824 the call to
waitForIdle is the local ConnectivityServiceTest function, but
after that patch TestNetworkAgentWrapper has an identically
named member that only wait for its own handler.

Bug: 141341704
Test: ConnectivityServiceTest --generate-new-metrics 100
Change-Id: I38709cc69ec7a261c1c6e008abe03d2882e2083d
2019-09-20 17:19:31 +09:00
Lorenzo Colitti
aa639e4ce8 Properly test TrafficController permissions on package updates.
The current test we have for a package changing TrafficController
permissions (i.e., INTERNET or UPDATE_DEVICE_STATS permissions)
is not realistic.

This is because the test simulates the update by removing and
adding the package. But TrafficController permissions are not
driven by broadcasts, they are driven by PackageListObserver,
and when an app is updated, PackageListObserver does not see a
remove and and add, but a single change event.

Add a new test for this.

Bug: 137864893
Test: new unit test added
Change-Id: I691b928f57c79c19dfb6ddb01983d55ef305c472
2019-09-20 11:58:43 +09:00
Xin Li
c769abcc81 [automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master
am: a32c176936 -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2dc is in history

Change-Id: I66d7727341c44123a1083d7833971c7284e786cd
2019-09-11 15:23:36 -07:00
Xin Li
6f082c6d5d [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 01d1f3942f -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2dc is in history

Change-Id: I6c6c0cd8aa4ac5968252f29c1e45f0e0768f5204
2019-09-11 13:59:58 -07:00
TreeHugger Robot
a32c176936 Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master 2019-09-11 20:31:32 +00:00
Steven Moreland
18680d4629 Merge "Remove libhwbinder/libhidltransport deps" am: 32f968b767
am: b3873361d5

Change-Id: I918bc5573f6f0efa676573209ce1874b02462576
2019-09-10 16:52:34 -07:00
Steven Moreland
b3873361d5 Merge "Remove libhwbinder/libhidltransport deps"
am: 32f968b767

Change-Id: I196f0ec3f1c3bcafc50c21f34774b089025eb046
2019-09-10 16:45:26 -07:00
Xin Li
01d1f3942f Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
2019-09-10 11:16:29 -07:00
Steven Moreland
ff493b1344 Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I136e4d4459bb8c3c5abf3c0758dd5ae14d0ad2a2
2019-09-09 16:28:55 +00:00
Xin Li
7c35925b2c [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 3e350bb864 -s ours am: cadfd1f6b1 -s ours
am: 299de19baf

Change-Id: Ie7b34f06a9600d4e9ddd9587aac1ce2aec5ad12f
2019-09-05 15:04:33 -07:00
Xin Li
b2195ad4f9 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 0eee7b5d83 -s ours am: 1166014e6c -s ours
am: 3ad6298d90

Change-Id: Ibf2eaa45d685bba0b3472b510a13e2c78a5f2277
2019-09-05 14:44:40 -07:00
Xin Li
299de19baf [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 3e350bb864 -s ours
am: cadfd1f6b1 -s ours
am skip reason: subject contains skip directive

Change-Id: Id766798b32e4613728ea35b502c15660b8e8fbb2
2019-09-05 14:41:36 -07:00
Xin Li
cadfd1f6b1 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: 3e350bb864 -s ours
am skip reason: subject contains skip directive

Change-Id: I47d5e62a09155529525a892c1687519f054d43f9
2019-09-05 14:18:24 -07:00
Xin Li
3ad6298d90 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 0eee7b5d83 -s ours
am: 1166014e6c -s ours
am skip reason: subject contains skip directive

Change-Id: I112f6ad00252d63046d6732a5c0fa72e7ff64e9c
2019-09-05 14:06:52 -07:00
Xin Li
1166014e6c [automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: 0eee7b5d83 -s ours
am skip reason: subject contains skip directive

Change-Id: I2fad02a5d974eb5bef685a9c695eb52f52f8749a
2019-09-05 13:26:43 -07:00
Xin Li
3e350bb864 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:23 +00:00
Lucas Lin
2703dbe88d Merge "Fix flaky test - testPartialConnectivity" am: f4aa4861e0 am: c8eaa3f08d
am: d0cbe60d32

Change-Id: I431756e6e52b99bbbad45f8310f718a40dd5a2b5
2019-09-05 05:32:09 -07:00
Lucas Lin
d0cbe60d32 Merge "Fix flaky test - testPartialConnectivity" am: f4aa4861e0
am: c8eaa3f08d

Change-Id: Ic38879fc39fda8ce84032d520f83608e10ea2dd9
2019-09-05 05:24:35 -07:00
Lucas Lin
c8eaa3f08d Merge "Fix flaky test - testPartialConnectivity"
am: f4aa4861e0

Change-Id: Ic643ec7a5641b531befc8a9c4af524177f97e761
2019-09-05 05:09:48 -07:00
Lucas Lin
f4aa4861e0 Merge "Fix flaky test - testPartialConnectivity" 2019-09-05 11:40:01 +00:00
lucaslin
e2bfa65a04 Fix flaky test - testPartialConnectivity
This timing issue is happened when test case already verified
NetworkMonitor#setAcceptPartialConnectivity() before
NetworkAgent send the CONNECTED state to ConnectivityService.
This test case expects that the
NetworkMonitor#setAcceptPartialConnectivity() will be invoked
when network state is CONNECTED in
ConnectivityService#updateNetworkInfo().

NetworkAgent communicates with ConnectivityService by
AsyncChannel. Before they connect to each other, the thread of
NetworkAgent is keeping idle, so waitForIdle cannot handle this
kind of case. Although they have connected to each other, but
they don't communicate with each other, waitForIdle() still
cannot handle this case. It means waitForIdle() can only handle
the case that NetworkAgent already connected to
ConnectivityService and NetworkAgent is communicating with
ConnectivityService. So, that's why waitForIdle() sometimes
doesn't work in this case, and the most simplest and right way
to fix this case is to wait the available callback then verify
the method.

Bug: 140306320
Test: atest FrameworksNetTests: \
      ConnectivityServiceTest#testPartialConnectivity \
      --generate-new-metrics 500

Change-Id: I64bfecbfe3c5776bd5c347a821f9127e79539c48
2019-09-05 11:39:20 +00:00
Remi NGUYEN VAN
ffa89f6e63 Merge "Add NetIdManagerTest" am: 4339cf3402 am: b050eabb3f
am: 309e2f539b

Change-Id: Iea5c3d1ab35678edf25f103e54784ce8ab49ca12
2019-09-05 00:22:50 -07:00
Remi NGUYEN VAN
309e2f539b Merge "Add NetIdManagerTest" am: 4339cf3402
am: b050eabb3f

Change-Id: I47250a4593af4d803942e0ac736b7c0625b6ee70
2019-09-05 00:08:58 -07:00
Remi NGUYEN VAN
b050eabb3f Merge "Add NetIdManagerTest"
am: 4339cf3402

Change-Id: Ifbebb446601fcbbdf91fff48dc66ad173a6ecc7c
2019-09-04 23:54:58 -07:00
Remi NGUYEN VAN
fde640da47 Merge "Add ConnectivityServiceIntegrationTest" am: 324d724fd7 am: 71df7f558a
am: eb75b11ce8

Change-Id: I256ee5f6bad08b4a6ca5037a80388b478ebff266
2019-09-04 23:01:43 -07:00
Remi NGUYEN VAN
eb75b11ce8 Merge "Add ConnectivityServiceIntegrationTest" am: 324d724fd7
am: 71df7f558a

Change-Id: I78627992846ce9e89abe0d8a9cf512c07552e4d2
2019-09-04 22:51:15 -07:00
Remi NGUYEN VAN
71df7f558a Merge "Add ConnectivityServiceIntegrationTest"
am: 324d724fd7

Change-Id: Ib82c5e5aee9e830a0efe8ea6335933237bb33856
2019-09-04 22:41:44 -07:00
Xin Li
0eee7b5d83 DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I9e3c4fe5406c9913d50fe3b07d7f7cef7a246b96
2019-09-04 13:33:59 -07:00
Remi NGUYEN VAN
f3ba3cd27b Add NetIdManagerTest
Add a simple test to verify that IDs loop correctly, that they skip used
IDs correctly, and throw when there is no remaining ID.

Test: atest com.android.server.NetIdManagerTest
Change-Id: I4c9518c725156d743286e062fd2eec1423a0459e
2019-09-04 15:57:58 +09:00
Remi NGUYEN VAN
ebe5298d84 Add ConnectivityServiceIntegrationTest
This test exercises the Connectivity <-> NetworkMonitor integration.
This CL only contains a simple test (network validates), but more
generally it sets up a test package that contains both services.jar
classes and NetworkStack classes, and runs NetworkStack components in
another process (using TestNetworkStackService).

ConnectivityServiceIntegrationTest runs in the test process and binds to
TestNetworkStackService to obtain TestNetworkStackConnector and to
NetworkStackInstrumentationService to obtain
NetworkStackInstrumentationConnector. That last connector allows the
test to mock NetworkMonitor HTTP Requests.

Test: atest FrameworksNetIntegrationTests
Change-Id: Ieca18e273609044cf6b1870d2f0dba33ca7b38d3
2019-09-04 15:57:47 +09:00
Guang Zhu
68b353e187 Merge "Mark 3 tests as flaky." am: f6c61f329a am: 4416eecc3a
am: decf31a759

Change-Id: I1af80ae660727f7902e98680c43f03cb7668682a
2019-09-02 12:45:42 -07:00
Guang Zhu
decf31a759 Merge "Mark 3 tests as flaky." am: f6c61f329a
am: 4416eecc3a

Change-Id: I6e33cfdfccbea43eaf36bd6a97098de523e31d33
2019-09-02 12:21:40 -07:00
Guang Zhu
4416eecc3a Merge "Mark 3 tests as flaky."
am: f6c61f329a

Change-Id: Ie1c38e247ccfaa407d35cf6b6e28306d36cdccca
2019-09-02 12:03:12 -07:00
Treehugger Robot
f6c61f329a Merge "Mark 3 tests as flaky." 2019-09-02 18:44:24 +00:00
Guang Zhu
6665297de9 Mark 3 tests as flaky.
Bug: 140306320
Bug: 140305589
Bug: 140305678
Test: apct/net/networking_framework_unit_test
Change-Id: I5a288d7d64b3e95e0025c2c1f4a64ffe85cc3cd6
2019-09-01 21:37:04 -07:00
Aurimas Liutikas
4886b1851b [automerger skipped] Merge "Add missing nullability annotations." am: 79373f74cd -s ours am: 97d561c8fd -s ours
am: 1b525c17c8 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 9242b6de9c is in history

Change-Id: If5de5ce42bdec77db69dc229a2f5c7367b28a560
2019-08-30 12:33:40 -07:00