Oscar Shu
8841a3a1a1
Merge "avoid generating reserved local MACs" am: 464e1b5e6f am: 6fcb2696cd am: 4f05f46f13
...
am: ddc3459236
2019-08-23 22:03:56 -07:00
Oscar Shu
ddc3459236
Merge "avoid generating reserved local MACs" am: 464e1b5e6f am: 6fcb2696cd
...
am: 4f05f46f13
Change-Id: Icce1e14fae4293d747d0f9a57c99bb52fee31ba0
2019-08-23 03:14:04 -07:00
Oscar Shu
6fcb2696cd
Merge "avoid generating reserved local MACs"
...
am: 464e1b5e6f
2019-08-23 02:24:15 -07:00
Paul Hu
a60f654b1e
Add SocketUtils CTS tests
...
Test APIs below:
makeNetlinkSocketAddress(int, int)
makePacketSocketAddress(short, int)
makePacketSocketAddress(int, byte[])
closeSocket(java.io.FileDescriptor)
Bug:129200596
Test: atest FrameworksNetTests
atest CtsNetTestCases --instant
Merged-In: I36252fdf516cf4a9d4506b615cdb38f5413739e5
(cherry picked from commit 93a53224d3a1cd6fc1de7d94955e03116b744e4a)
Change-Id: I0963acaf00c5bdd93db0503c426f190f409ca076
2019-08-23 02:13:40 +00:00
Oscar Shu
464e1b5e6f
Merge "avoid generating reserved local MACs"
2019-08-21 17:45:00 +00:00
Android Build Merger (Role)
613aa66e20
Merge "[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 am: c3c41babff -s ours am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 5fed8d9ee3 is in history" into qt-qpr1-dev-plus-aosp
2019-08-17 14:28:18 +00:00
Chiachang Wang
bd49c5e8eb
[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1
...
am: c3c41babff -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 5fed8d9ee3
2019-08-17 07:27:18 -07:00
Chiachang Wang
5048e4a80d
[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev
...
am: 559e7a3de1 -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 5fed8d9ee3
2019-08-17 07:17:49 -07:00
xshu
8438a85683
avoid generating reserved local MACs
...
Avoid generating WifiInfo.DEFAULT_MAC_ADDRESS as a randomized MAC
address since it's being used for another purpose.
Bug: 137796328
Test: atest MacAddressTest
Change-Id: Ia7beef0d0af5d7b39845e662cd343d81aef97702
2019-08-16 10:20:22 -07:00
Chiachang Wang
0dc044aac7
Get resource based on subId for multi-SIM
...
The resource loading is done based on the last SIM to come up
which is not a deterministic design. Thus, update the way to get
the resource based on the subId.
Test: atest FrameworksNetTests
Test: manually test with avoid bad wifi feature supported sim
Bug: 138956509
Change-Id: Ib5b085d97103889600773d269e03b939c29ca47d
Merged-In: Ib5b085d97103889600773d269e03b939c29ca47d
(cherry picked from commit 5e994ea02c7a820543f3726186240548676f4b4e)
2019-08-14 12:15:56 +00:00
Chiachang Wang
115b77593c
Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4 am: 85ff8a6902
...
am: 2b7f2fbb5b
Change-Id: I1e69a49c88f6123f735075934f2f2e08f15f2bff
2019-08-14 04:54:59 -07:00
Chiachang Wang
85ff8a6902
Merge "Get resource based on subId for multi-SIM"
...
am: 55752cf8d4
Change-Id: I020c2546fa4432d05cf27b20fdb1943508aac671
2019-08-14 04:30:57 -07:00
Chiachang Wang
5fed8d9ee3
Get resource based on subId for multi-SIM
...
The resource loading is done based on the last SIM to come up
which is not a deterministic design. Thus, update the way to get
the resource based on the subId.
Test: atest FrameworksNetTests
Test: manually test with avoid bad wifi feature supported sim
Bug: 138956509
Change-Id: Ib5b085d97103889600773d269e03b939c29ca47d
2019-08-14 13:56:37 +08:00
Remi NGUYEN VAN
b0cbc5d051
Merge "Extract test utilities for ConnectivityService" am: ecaff61c4b am: 9e23af5f90
...
am: 6d34ffb4e6
Change-Id: Ib760ef922a440d54bab8c1647d8444ab2a717094
2019-08-06 15:57:04 -07:00
Remi NGUYEN VAN
9e23af5f90
Merge "Extract test utilities for ConnectivityService"
...
am: ecaff61c4b
2019-08-06 14:58:43 -07:00
Treehugger Robot
ecaff61c4b
Merge "Extract test utilities for ConnectivityService"
2019-08-06 11:04:36 +00:00
Chalard Jean
e9a705c65d
Merge "Fix null pointer exception of calling NetworkInfo.mState.name()" am: 95d62d8e55 am: a61bb686ae
...
am: c560826d4d
Change-Id: Iec9e7aff73662369b5e922626494d42c025a2cb6
2019-08-02 13:57:10 -07:00
Chalard Jean
a61bb686ae
Merge "Fix null pointer exception of calling NetworkInfo.mState.name()"
...
am: 95d62d8e55
2019-08-02 13:25:36 -07:00
Chalard Jean
95d62d8e55
Merge "Fix null pointer exception of calling NetworkInfo.mState.name()"
2019-08-02 19:56:10 +00:00
Remi NGUYEN VAN
0d0eb15091
Extract test utilities for ConnectivityService
...
The utilities help using ConnectivityService in tests, and will be used
to write integration tests for ConnectivityService.
Test: atest FrameworksNetTests
Change-Id: Ie895ad05139cd5768d3d8a9bd5589d72571f47e6
2019-08-01 16:32:30 +09:00
Yintang Gu
5014b52a5f
Fix null pointer exception of calling NetworkInfo.mState.name()
...
Remove setting nai.networkInfo as null temporarily to identify the new
created NetworkAgent, avoiding timing issue triggered by constructor
NetworkInfo(null).
Bug: 135569043
Test: Mannual test, network can work normally
Change-Id: I123ef9e97df2bccdd9528c0e894283c66d053890
2019-07-31 11:07:37 +08:00
Xin Li
c7862ae297
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 1354864491 -s ours am: f36ebb71a8 -s ours
...
am: 0ad3e0074f
Change-Id: I96ecd52959d20c7ebbbf662889ea2babd6e21b1b
2019-07-10 22:50:22 -07:00
Xin Li
f36ebb71a8
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
am: 1354864491
2019-07-10 21:20:46 -07:00
Xin Li
1354864491
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
Bug: 136196576
Change-Id: I481d824726ae0260b42cd7a4acc1c6fce593c324
2019-07-09 15:13:36 -07:00
Fedor Kudasov
5b79d28d9e
Merge "Return NonNull and other imports" into stage-aosp-master am: ee24c6da27
...
am: 6619c84f7f
Change-Id: I2b5f7da15051c57b2050b78100b69e87ebbaf989
2019-07-09 07:46:55 -07:00
Fedor Kudasov
26f1ab857b
Return NonNull and other imports
...
Change-Id: Ia38b13209b45d8228ac02f06663e4dc12be9de60
2019-07-09 14:19:04 +00:00
Fedor Kudasov
e2ccfcbfc5
Merge changes from topic "fix_master_build" am: 2e5319117a am: da2257cea2
...
am: 95cc083588
Change-Id: I3f5ec7c9b170e5f168a300a86364559ea88e0c93
2019-07-09 06:42:44 -07:00
Fedor Kudasov
da2257cea2
Merge changes from topic "fix_master_build"
...
am: 2e5319117a
Change-Id: If49999e7ce6149e847a678b03ccf8b4549f8365b
2019-07-09 06:10:01 -07:00
Fedor Kudasov
2559cb3953
Revert "Cherry-pick the relevant parts of master change"
...
This reverts commit 5a4844e307
2019-07-09 09:29:17 +00:00
Fedor Kudasov
496a313f47
Revert "Remove providesRoutesToMostDestinations."
...
This reverts commit 92bd90fa0b
2019-07-09 09:23:25 +00:00
Chalard Jean
2184d73448
Merge changes Ia43f8811,I7de4f672 am: 3ef04b8e3c am: 4896785b0b
...
am: 40b8170b09
Change-Id: I11fcb4a1fbf5ccb46c41469529b3d5dfbbbdd394
2019-07-09 01:19:20 -07:00
Chalard Jean
4896785b0b
Merge changes Ia43f8811,I7de4f672
...
am: 3ef04b8e3c
Change-Id: Ifcacd81d343a29b17fdb79f4c8b54c89a293a2b8
2019-07-09 00:56:57 -07:00
Chalard Jean
82d8547379
Merge "Refactor TestNetworkCallback out of ConnectivityServiceTest." am: b268cb5c6e am: 17f89499ea
...
am: 393826d56e
Change-Id: Id90f1ca9fe90efc20d40cc31b495209b1981fdd6
2019-07-08 17:25:40 -07:00
android-build-team Robot
468cc3a375
Snap for 5622519 from b869620327dabaebe715a7d8fb3d12cdddd5a221 to pi-platform-release
...
Change-Id: I77f90a13ae9a3897eeffcc49b91ab9088f5d8001
2019-07-08 23:28:48 +00:00
Chalard Jean
17f89499ea
Merge "Refactor TestNetworkCallback out of ConnectivityServiceTest."
...
am: b268cb5c6e
Change-Id: I44b66d1d606c5bb454ae49de234cfa0dbbb2bed2
2019-07-08 14:00:56 -07:00
Chalard Jean
92bd90fa0b
Remove providesRoutesToMostDestinations.
...
This function is not used any more.
Test: FrameworksNetTests
Change-Id: Ia43f8811cb9d575e16735b0f4b76d91e7cd42ebc
2019-07-08 20:36:33 +09:00
Chalard Jean
5a4844e307
Cherry-pick the relevant parts of master change
...
I566437e4fe10e1346858149120c50b3c20ca073f to avoid a conflict
Test: atest FrameworksNetTests
Change-Id: I7de4f67234bf97d58bddffa22272c7670398f56d
2019-07-08 20:25:45 +09:00
Chalard Jean
9ce1e28788
Refactor TestNetworkCallback out of ConnectivityServiceTest.
...
TestableNetworkCallback will become a standard tool. This patch
and its companion in packages/modules/NetworkStack mostly move
it out of ConnectivityServiceTest, but also applies a few
cleanups like reordering arguments for standard order, renaming
...Like to ...That to match Mockito namings, and introduces
stonger static typing on some callbacks, which allows to remove
some unchecked casts.
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I808a95ac33ec0c81a8829cad36a6917524297574
2019-07-04 16:12:40 +09:00
Paul Hu
9126f84578
Merge "Correct FrameworksNetTests-jni-defaults lib" am: fa71b4f4a0 am: 8bb71707e0
...
am: fb7a5f06b7
Change-Id: Iadd6609db0ff4f86194a9ee323cd2facaace9fa9
2019-07-02 16:20:50 -07:00
Paul Hu
8bb71707e0
Merge "Correct FrameworksNetTests-jni-defaults lib"
...
am: fa71b4f4a0
Change-Id: I53ca8c198b9d4bb0e743ee5010469a7375dc3cc4
2019-07-02 10:23:03 -07:00
paulhu
a1dbf5b964
Correct FrameworksNetTests-jni-defaults lib
...
FrameworksNetTests-jni-defaults lib should only contain jni
dependencies. Remove static_libs/libs from it and update
FrameworksNetTests/FrameworksNetSmokeTests libs as well.
Bug: NA
Test: atest FrameworksNetSmokeTests FrameworksNetTests
Change-Id: I705e949e4c00035c9734b6a240529d1c2216eb6b
2019-07-01 09:29:13 +00:00
Lorenzo Colitti
5ec2bdf97c
Merge "Unit tests for new explicitlySelected behaviour." am: d1379a4a80 am: 10c1a704c0
...
am: c3bb7285f4
2019-06-29 02:16:43 -07:00
Lorenzo Colitti
c3bb7285f4
Merge "Unit tests for new explicitlySelected behaviour." am: d1379a4a80
...
am: 10c1a704c0
Change-Id: Id77a5d6a58e7ab4fdaa0b7c15b824270863b83fd
2019-06-29 02:01:55 -07:00
Chalard Jean
bee0aa1c32
Merge "Simplify Exception expressions in CSTest" am: 763d449493 am: cb5aa75dd9
...
am: 111dc6853a
2019-06-28 09:06:33 -07:00
Chalard Jean
111dc6853a
Merge "Simplify Exception expressions in CSTest" am: 763d449493
...
am: cb5aa75dd9
Change-Id: Iae16e8d68e2b1b9a1e5aa86170177c68b22cd7b5
2019-06-28 08:57:18 -07:00
Lorenzo Colitti
f255e047b7
Unit tests for new explicitlySelected behaviour.
...
ag/7905088 added the ability to pass in acceptUnvalidated without
passing in explicitlySelected. Add unit tests for that code.
While I'm at it, convert a couple of "== 1"s to toBool(), and
update the comments in NetworkAgent.
Bug: 130766237
Test: atest FrameworksNetTests
Change-Id: I6b550bd621e3596975f83464c7b4b8a14269120b
2019-06-28 23:57:22 +09:00
Chalard Jean
763d449493
Merge "Simplify Exception expressions in CSTest"
2019-06-28 07:19:20 +00:00
Chalard Jean
484c4219d9
Simplify Exception expressions in CSTest
...
Test: CSTest
Change-Id: Ie9b9fc334b85836bf156bda71e54e8d30885b82a
2019-06-28 14:22:30 +09:00
Lorenzo Colitti
d4ed795ad3
Merge "Remove all static members from NetworkStatsFactory." am: 63f94f411b am: 5409264cee
...
am: 21ea4bcc96
2019-06-27 19:56:01 -07:00
Lorenzo Colitti
21ea4bcc96
Merge "Remove all static members from NetworkStatsFactory." am: 63f94f411b
...
am: 5409264cee
Change-Id: Iada14a1fea74197014e75a1112c7a5b35d6b1a1d
2019-06-27 19:40:01 -07:00
