Paul Hu
0cddfcecb8
[automerger skipped] Merge "Add SocketUtils CTS tests am: 4f4206d56f am: c91dfb967b" into qt-r1-dev-plus-aosp am: f5f95fce12
...
am: 69dfdd247a -s ours
am skip reason: change_id I36252fdf516cf4a9d4506b615cdb38f5413739e5 with SHA1 6b16c42b64 is in history
Change-Id: Id31da8aaa8782d340d77dc81c784ee603cb2458e
2019-08-26 15:11:04 -07:00
Paul Hu
69dfdd247a
Merge "Add SocketUtils CTS tests am: 4f4206d56f am: c91dfb967b" into qt-r1-dev-plus-aosp
...
am: f5f95fce12
Change-Id: I26b15368b078084158ad91df5d26cea93aff8cd4
2019-08-26 13:53:50 -07:00
Paul Hu
576bc91214
Add SocketUtils CTS tests am: 4f4206d56f
...
am: c91dfb967b
Change-Id: I83abe9535018a161241c4d57f69960254f310c17
2019-08-25 20:33:52 -07:00
Paul Hu
c91dfb967b
Add SocketUtils CTS tests
...
am: 4f4206d56f
Change-Id: I92a6b3e5cb1fa993dfaeacb442cbf6b401dd5996
2019-08-25 20:21:52 -07:00
Oscar Shu
e686dcfd8f
Merge "avoid generating reserved local MACs" am: da8955aa2a am: 0ea945e919 am: 4f05f46f13 am: f30d01c91b
...
am: 83de8f4348
Change-Id: If0fdc7bd46f711714986440a9a905f2ccb154830
2019-08-24 01:33:53 -07:00
Oscar Shu
83de8f4348
Merge "avoid generating reserved local MACs" am: da8955aa2a am: 0ea945e919 am: 4f05f46f13
...
am: f30d01c91b
Change-Id: Ib6e9917c555ab4ef5769aaca1ef6987dfbc185c1
2019-08-23 22:03:56 -07: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
Change-Id: Ia6d0eb0c5e8101d9c4b4bc63de79157f7d1c2284
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 )
Change-Id: I0963acaf00c5bdd93db0503c426f190f409ca076
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
0764f54bf5
Merge "[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 am: c3c41babff -s ours
...
am: a0bfba8ba6 -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 4d0479e43d is in history
Change-Id: I89c6875e66f3223a9b86ff0a721694bbaa271937
2019-08-17 07:56:18 -07:00
Chiachang Wang
8f3aa16663
[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 am: c3c41babff -s ours
...
am: 3322d60ef0 -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 4d0479e43d is in history
Change-Id: Id9ee99550980efa1f12d44dc7db30a23c7766087
2019-08-17 07:44:03 -07:00
Chiachang Wang
70de8968ec
[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 -s ours am: d4e0075b97 -s ours
...
am: 9e0e6dca6d -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 113d65976b is in history
Change-Id: Ibedf0c2e42da973414f90b1250c2434c377b57e0
2019-08-17 07:37:20 -07:00
Android Build Merger (Role)
a0bfba8ba6
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 113d65976b is in history" into qt-qpr1-dev-plus-aosp
2019-08-17 14:28:18 +00:00
Chiachang Wang
3322d60ef0
[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 113d65976b is in history
Change-Id: If85845ae5b8af10afdb9422d92cdbf599b294d2f
2019-08-17 07:27:18 -07: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 is in history
Change-Id: I405bb51787bce13441aa4c3b985ef2b92df18826
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
a3e4f5c790
Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4 am: a784eb71ef am: 2b7f2fbb5b am: 879358bcf2
...
am: 953f3a62ce
Change-Id: Ief32e4d6376062ba6e86472e39d84681f562980a
2019-08-14 05:21:30 -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
b3fb37ea9d
Merge "Extract test utilities for ConnectivityService" am: 4b9f5ddda5 am: dafaf4472f am: 6d34ffb4e6 am: f4d0e9dac9
...
am: e2967d9830
Change-Id: I0bb8a965d11e9f16ac70f62a2319e1dc8e7544df
2019-08-06 16:31:01 -07: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
Change-Id: I0ac2a480f961bb6fd1d83dedad6a7942ee03858f
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
a2aae6b56f
Merge "Fix null pointer exception of calling NetworkInfo.mState.name()" am: 10f66f7af5 am: ff68da8ed9 am: c560826d4d am: d5a4435f01
...
am: 6f1321a7b6
Change-Id: I7f50e9a73658fefbe9877f9fbf7ec20fdacb7ecf
2019-08-02 14:19:39 -07: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
Change-Id: Ic003b658854f9407ed8024771c6219df2b6e3806
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
Artur Satayev
4510ea5101
Add @UnsupportedAppUsage annotations for max-p.
...
See go/UnsupportedAppUsage for more details.
These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug: 137350495
Test: m
Change-Id: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
2019-08-01 19:46:29 +01: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
87c557eeac
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: c6b64cea29 -s ours am: 8dc1320bcd -s ours am: 0ad3e0074f
...
am: b1c2d8d1e5 -s ours
am skip reason: subject contains skip directive
Change-Id: I826119b834739848220e8b243e5c1fbe6cbde2a3
2019-07-10 23:24:38 -07: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 -s ours
am skip reason: subject contains skip directive
Change-Id: Ida5e78dda30bfc7e9a0a76a2f85cc97e789ced82
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
c6a5221d68
Merge "Return NonNull and other imports" into stage-aosp-master am: ee24c6da27 am: 6619c84f7f
...
am: b3c968778c
Change-Id: Ic66313bca08673e7bec89547d47cb435202530d5
2019-07-09 07:55:46 -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
685020fa69
Merge changes from topic "fix_master_build" am: 2e5319117a am: 2a8415d137 am: 95cc083588
...
am: 1860792b9f
Change-Id: Ic58f839b76369b9adcef2a17da289c1b8c2fd0ca
2019-07-09 06:53:38 -07: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 .
Reason for revert: multiple build breakages b/137069068
Change-Id: If48bfa2d2cab0877a053743b3ec53820d0c4ed6b
2019-07-09 09:29:17 +00:00
Fedor Kudasov
20a09d85cf
Revert "Remove providesRoutesToMostDestinations."
...
This reverts commit 7d1213dd5d .
Reason for revert: multiple build breakages b/137069068
Change-Id: I60a4f71e13fe82f970b177a07c0b58439cbc64ff
2019-07-09 09:23:25 +00:00
Chalard Jean
c9e4e13cd1
Merge changes Ia43f8811,I7de4f672 am: 3ef04b8e3c am: 9b762d747f am: 40b8170b09
...
am: 583aa549ea
Change-Id: Ie13685fab53fb7f2482b9cf0a3294ccb284b71bd
2019-07-09 01:29:24 -07: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
ffc66226d0
Merge "Refactor TestNetworkCallback out of ConnectivityServiceTest." am: b268cb5c6e am: 20a661c44a am: 393826d56e
...
am: f72e69bd5d
Change-Id: I10b0e57ac7a9000ceb662e3e9358f4fca5fcfdb1
2019-07-08 17:57:14 -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