Lorenzo Colitti
48515fdc8b
Merge changes I69cdbb16,I6975e0b7 am: d889cb5098 am: 5fecd24f17
...
am: 5b943c34fd
2019-08-27 03:58:57 -07:00
Lorenzo Colitti
5b943c34fd
Merge changes I69cdbb16,I6975e0b7 am: d889cb5098
...
am: 5fecd24f17
2019-08-27 03:44:40 -07:00
Lorenzo Colitti
5fecd24f17
Merge changes I69cdbb16,I6975e0b7
...
am: d889cb5098
Change-Id: I3c8ddf7809a0d443587c1c4c06ef56ac302fc80f
2019-08-27 03:31:02 -07:00
Paul Hu
a09c956a1c
Merge "Add SocketUtils CTS tests am: 4f4206d56f" into qt-dev-plus-aosp
...
am: 364c77f92e
Change-Id: I99307d7aeb0e8c96de51e53a5bc373e570715860
2019-08-25 20:39:10 -07:00
Paul Hu
576bc91214
Add SocketUtils CTS tests am: 4f4206d56f
...
am: c91dfb967b
2019-08-25 20:33:52 -07:00
Paul Hu
89a0034bf1
Add SocketUtils CTS tests
...
am: 4f4206d56f
2019-08-25 20:21:56 -07:00
Paul Hu
c91dfb967b
Add SocketUtils CTS tests
...
am: 4f4206d56f
2019-08-25 20:21:52 -07:00
wangmingming1
b020abc61c
notify netd about uid internet permission changes when package replaced
...
1. If a previous version of an app doesn't declare internet permission;
2. The User upgraded it to a new version and the new one does declare the
internet permission;
3. The new app are not allowed to access the internet until next boot
Bug: 137864893
Test: Manual, just make sure the onPackageChanged would be executed on package changes
Change-Id: I69cdbb16a027a9c4e974b32371b1f64a23a51a23
Signed-off-by: wangmingming1 <wangmingming1@xiaomi.com >
2019-08-26 09:30:59 +09:00
Oscar Shu
f30d01c91b
Merge "avoid generating reserved local MACs" am: da8955aa2a am: 0ea945e919
...
am: 4f05f46f13
Change-Id: Icce1e14fae4293d747d0f9a57c99bb52fee31ba0
2019-08-23 03:14:04 -07:00
Oscar Shu
0ea945e919
Merge "avoid generating reserved local MACs"
...
am: da8955aa2a
2019-08-23 02:24:15 -07:00
Paul Hu
4f4206d56f
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 6b16c42b64
2019-08-23 02:13:40 +00:00
Oscar Shu
da8955aa2a
Merge "avoid generating reserved local MACs"
2019-08-21 17:45:00 +00:00
Chiachang Wang
d4e0075b97
[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 113d65976b
2019-08-17 07:17:49 -07:00
xshu
f6ff8b31f0
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
4d0479e43d
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
879358bcf2
Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4 am: a784eb71ef
...
am: 2b7f2fbb5b
Change-Id: I1e69a49c88f6123f735075934f2f2e08f15f2bff
2019-08-14 04:54:59 -07:00
Chiachang Wang
a784eb71ef
Merge "Get resource based on subId for multi-SIM"
...
am: 55752cf8d4
Change-Id: I020c2546fa4432d05cf27b20fdb1943508aac671
2019-08-14 04:30:57 -07:00
Chiachang Wang
113d65976b
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
f4d0e9dac9
Merge "Extract test utilities for ConnectivityService" am: 4b9f5ddda5 am: dafaf4472f
...
am: 6d34ffb4e6
Change-Id: Ib760ef922a440d54bab8c1647d8444ab2a717094
2019-08-06 15:57:04 -07:00
Remi NGUYEN VAN
dafaf4472f
Merge "Extract test utilities for ConnectivityService"
...
am: 4b9f5ddda5
2019-08-06 14:58:43 -07:00
Treehugger Robot
4b9f5ddda5
Merge "Extract test utilities for ConnectivityService"
2019-08-06 11:04:36 +00:00
Chalard Jean
d5a4435f01
Merge "Fix null pointer exception of calling NetworkInfo.mState.name()" am: 10f66f7af5 am: ff68da8ed9
...
am: c560826d4d
Change-Id: Iec9e7aff73662369b5e922626494d42c025a2cb6
2019-08-02 13:57:10 -07:00
Chalard Jean
ff68da8ed9
Merge "Fix null pointer exception of calling NetworkInfo.mState.name()"
...
am: 10f66f7af5
2019-08-02 13:25:36 -07:00
Chalard Jean
10f66f7af5
Merge "Fix null pointer exception of calling NetworkInfo.mState.name()"
2019-08-02 19:56:10 +00:00
Remi NGUYEN VAN
e9741e4f1b
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
4bb1924d32
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
b1c2d8d1e5
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: c6b64cea29 -s ours am: 8dc1320bcd -s ours
...
am: 0ad3e0074f
Change-Id: I96ecd52959d20c7ebbbf662889ea2babd6e21b1b
2019-07-10 22:50:22 -07:00
Xin Li
8dc1320bcd
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
am: c6b64cea29
2019-07-10 21:20:46 -07:00
Xin Li
c6b64cea29
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
b3c968778c
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
12ab343b65
Return NonNull and other imports
...
Change-Id: Ia38b13209b45d8228ac02f06663e4dc12be9de60
2019-07-09 14:19:04 +00:00
Fedor Kudasov
1860792b9f
Merge changes from topic "fix_master_build" am: 2e5319117a am: 2a8415d137
...
am: 95cc083588
Change-Id: I3f5ec7c9b170e5f168a300a86364559ea88e0c93
2019-07-09 06:42:44 -07:00
Fedor Kudasov
2a8415d137
Merge changes from topic "fix_master_build"
...
am: 2e5319117a
Change-Id: If49999e7ce6149e847a678b03ccf8b4549f8365b
2019-07-09 06:10:01 -07:00
Fedor Kudasov
5f462af5fa
Revert "Cherry-pick the relevant parts of master change"
...
This reverts commit 667af45299
2019-07-09 09:29:17 +00:00
Fedor Kudasov
20a09d85cf
Revert "Remove providesRoutesToMostDestinations."
...
This reverts commit 7d1213dd5d
2019-07-09 09:23:25 +00:00
Chalard Jean
583aa549ea
Merge changes Ia43f8811,I7de4f672 am: 3ef04b8e3c am: 9b762d747f
...
am: 40b8170b09
Change-Id: I11fcb4a1fbf5ccb46c41469529b3d5dfbbbdd394
2019-07-09 01:19:20 -07:00
Chalard Jean
9b762d747f
Merge changes Ia43f8811,I7de4f672
...
am: 3ef04b8e3c
Change-Id: Ifcacd81d343a29b17fdb79f4c8b54c89a293a2b8
2019-07-09 00:56:57 -07:00
Chalard Jean
f72e69bd5d
Merge "Refactor TestNetworkCallback out of ConnectivityServiceTest." am: b268cb5c6e am: 20a661c44a
...
am: 393826d56e
Change-Id: Id90f1ca9fe90efc20d40cc31b495209b1981fdd6
2019-07-08 17:25:40 -07:00
android-build-team Robot
7e3db9e2eb
Snap for 5622519 from b869620327dabaebe715a7d8fb3d12cdddd5a221 to pi-platform-release
...
Change-Id: I77f90a13ae9a3897eeffcc49b91ab9088f5d8001
2019-07-08 23:28:48 +00:00
Chalard Jean
20a661c44a
Merge "Refactor TestNetworkCallback out of ConnectivityServiceTest."
...
am: b268cb5c6e
Change-Id: I44b66d1d606c5bb454ae49de234cfa0dbbb2bed2
2019-07-08 14:00:56 -07:00
Chalard Jean
7d1213dd5d
Remove providesRoutesToMostDestinations.
...
This function is not used any more.
Test: FrameworksNetTests
Change-Id: Ia43f8811cb9d575e16735b0f4b76d91e7cd42ebc
2019-07-08 20:36:33 +09:00
Chalard Jean
667af45299
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
14986887c6
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
9b0b8798b4
Merge "Correct FrameworksNetTests-jni-defaults lib" am: fa71b4f4a0 am: 60cf92fc32
...
am: fb7a5f06b7
Change-Id: Iadd6609db0ff4f86194a9ee323cd2facaace9fa9
2019-07-02 16:20:50 -07:00
Paul Hu
60cf92fc32
Merge "Correct FrameworksNetTests-jni-defaults lib"
...
am: fa71b4f4a0
Change-Id: I53ca8c198b9d4bb0e743ee5010469a7375dc3cc4
2019-07-02 10:23:03 -07:00
paulhu
d937f7467f
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
ab82d3b46b
Merge "Unit tests for new explicitlySelected behaviour." am: d1379a4a80 am: 10c1a704c0
...
am: 95e816823c
2019-06-29 02:16:43 -07:00
Lorenzo Colitti
95e816823c
Merge "Unit tests for new explicitlySelected behaviour." am: d1379a4a80
...
am: 10c1a704c0
Change-Id: Id77a5d6a58e7ab4fdaa0b7c15b824270863b83fd
2019-06-29 02:01:55 -07:00
Chalard Jean
6a5ddcc3a2
Merge "Simplify Exception expressions in CSTest" am: 7297e541f6 am: cb5aa75dd9
...
am: b15d83a150
2019-06-28 09:06:33 -07:00
Chalard Jean
b15d83a150
Merge "Simplify Exception expressions in CSTest" am: 7297e541f6
...
am: cb5aa75dd9
Change-Id: Iae16e8d68e2b1b9a1e5aa86170177c68b22cd7b5
2019-06-28 08:57:18 -07:00
