Chiachang Wang
1cc264ebd4
[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 am: c3c41babff -s ours
...
am: bd49c5e8eb0dc044aac7
2019-08-17 07:44:03 -07:00
Chiachang Wang
0519896a5b
[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 -s ours am: 5048e4a80d -s ours
...
am: 9e0e6dca6d -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 5fed8d9ee3
2019-08-17 07:37:20 -07: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
Chiachang Wang
b239e45d1f
Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4 am: 85ff8a6902 am: 2b7f2fbb5b am: 115b77593c
...
am: 953f3a62ce
Change-Id: Ief32e4d6376062ba6e86472e39d84681f562980a
2019-08-14 05:21:30 -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
f37a3ed07d
Merge "Extract test utilities for ConnectivityService" am: ecaff61c4b am: 9e23af5f90 am: 6d34ffb4e6 am: b0cbc5d051
...
am: e2967d9830
Change-Id: I0bb8a965d11e9f16ac70f62a2319e1dc8e7544df
2019-08-06 16:31:01 -07: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
73ef5a4810
Merge "Fix null pointer exception of calling NetworkInfo.mState.name()" am: 95d62d8e55 am: a61bb686ae am: c560826d4d am: e9a705c65d
...
am: 6f1321a7b6
Change-Id: I7f50e9a73658fefbe9877f9fbf7ec20fdacb7ecf
2019-08-02 14:19:39 -07: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
Artur Satayev
f269537490
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
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
1e0acb2ca0
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 1354864491 -s ours am: f36ebb71a8 -s ours am: 0ad3e0074f
...
am: c7862ae297
2019-07-10 23:24:38 -07: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
755fc702d4
Merge "Return NonNull and other imports" into stage-aosp-master am: ee24c6da27 am: 6619c84f7f
...
am: 5b79d28d9e
2019-07-09 07:55:46 -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
b2539c8c47
Merge changes from topic "fix_master_build" am: 2e5319117a am: da2257cea2 am: 95cc083588
...
am: e2ccfcbfc5
2019-07-09 06:53:38 -07: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
a7a94e0b8d
Merge changes Ia43f8811,I7de4f672 am: 3ef04b8e3c am: 4896785b0b am: 40b8170b09
...
am: 2184d73448
2019-07-09 01:29:24 -07: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
e15a7ef721
Merge "Refactor TestNetworkCallback out of ConnectivityServiceTest." am: b268cb5c6e am: 17f89499ea am: 393826d56e
...
am: 82d8547379
2019-07-08 17:57:14 -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
aa492869aa
Merge "Correct FrameworksNetTests-jni-defaults lib" am: fa71b4f4a0 am: 8bb71707e0 am: fb7a5f06b7
...
am: 9126f84578
2019-07-02 17:30:41 -07: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
89579d64e8
Merge "Unit tests for new explicitlySelected behaviour." am: d1379a4a80 am: 10c1a704c0 am: c3bb7285f4
...
am: 5ec2bdf97c
2019-06-29 02:31:48 -07: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
69df86316f
Merge "Simplify Exception expressions in CSTest" am: 763d449493 am: cb5aa75dd9 am: 111dc6853a
...
am: bee0aa1c32
2019-06-28 09:39:33 -07:00
