LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,395 Commits 2 Branches 0 Tags
a1a975e1499c26aa8f114b9ca95029bdef32b50c
Commit Graph

7395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 -s ours
am skip reason: subject contains skip directive

Change-Id: Ida5e78dda30bfc7e9a0a76a2f85cc97e789ced82
 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.

Reason for revert: multiple build breakages b/137069068

Change-Id: If48bfa2d2cab0877a053743b3ec53820d0c4ed6b
 2019-07-09 09:29:17 +00:00
Fedor Kudasov
496a313f47 Revert "Remove providesRoutesToMostDestinations." 
This reverts commit 92bd90fa0b.

Reason for revert: multiple build breakages b/137069068

Change-Id: I60a4f71e13fe82f970b177a07c0b58439cbc64ff
 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

Change-Id: I3b7588360b9e302a6032ae6242d937f4e68eb88d
 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

Change-Id: I91ffbbb031d9ff6f36c51bc567ac6ce22386d07c
 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

Change-Id: I7f787d14b7c7dee7a77dbed84266f8192c21c446
 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
Chalard Jean
e6ab740f9e Merge "Revert "Simplify Exception expressions in CSTest"" am: 0fd0e96a40 am: 60422b8e88 
am: e2eb03b140

Change-Id: If0a6e45f1aee111de0f0f9eee8ed310c2ef47225
 2019-06-27 10:04:04 -07:00
Lorenzo Colitti
56a50e0bb5 Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." am: c657dd301f am: 92292f556b 
am: fbac9eefb8

Change-Id: Ibe2fcacb3779b3c6bc484fe6f398475bf5b6383b
 2019-06-27 09:26:02 -07:00
Chalard Jean
29e549bf23 Merge "Simplify Exception expressions in CSTest" am: afbf997ad5 am: 8e3bf0f8e3 
am: c421078227

Change-Id: Id2bf1ddd6785057292678a1a915a3bf35a7515f7
 2019-06-27 09:23:14 -07:00
Chalard Jean
b78f61ed35 Merge "Unify assertThrows" am: 0272942bca am: 3f21f94616 
am: 546cdc06f8

Change-Id: I47dd5930dcf10edd22a4964f2fcc979ad901d723
 2019-06-27 09:22:21 -07:00
Chalard Jean
e2eb03b140 Merge "Revert "Simplify Exception expressions in CSTest"" am: 0fd0e96a40 
am: 60422b8e88

Change-Id: I80d94fa746d533a83e3ce01377dabd2aab0c3229
 2019-06-27 02:53:23 -07:00
Lorenzo Colitti
c75633460e Remove all static members from NetworkStatsFactory. 
NetworkStatsFactory is owned by NetworkStatsService, and any
accesses to NSF data should go through NSS.

Test: atest FrameworksNetTests
Change-Id: Idbd0dbbaeb11313f63474e7ec0e01f974349fc89
 2019-06-27 17:39:05 +09:00
Lorenzo Colitti
fbac9eefb8 Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." am: c657dd301f 
am: 92292f556b

Change-Id: If897c9c95fc8571949183c45a99a5c28cb032ebb
 2019-06-27 01:31:46 -07:00
Chalard Jean
0fd0e96a40 Merge "Revert "Simplify Exception expressions in CSTest"" 2019-06-27 08:30:57 +00:00
Chalard Jean
de6bb3e852 Revert "Simplify Exception expressions in CSTest" 
This reverts commit d209586554.

Reason for revert: Breaks the build because it removes an unused method that was used by a change intervening in the mean time

Bug: 136143444
Change-Id: Id3a17e0b16ec03276609ca96fb7b582188ed1077
 2019-06-27 08:30:05 +00:00
Chalard Jean
c421078227 Merge "Simplify Exception expressions in CSTest" am: afbf997ad5 
am: 8e3bf0f8e3

Change-Id: I32182775bf36918438868c5b77d8d1aa995c788a
 2019-06-27 01:11:02 -07:00
Chalard Jean
546cdc06f8 Merge "Unify assertThrows" am: 0272942bca 
am: 3f21f94616

Change-Id: If349f647b34a71bc4eb1ba25ca18d543437eb969
 2019-06-27 01:05:16 -07:00
Lorenzo Colitti
c657dd301f Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." 2019-06-27 07:53:30 +00:00
Chalard Jean
afbf997ad5 Merge "Simplify Exception expressions in CSTest" 2019-06-27 07:09:36 +00:00
Chalard Jean
0272942bca Merge "Unify assertThrows" 2019-06-27 07:08:59 +00:00
Lorenzo Colitti
f5af7fcf16 Transfer ownership of NetworkStatsFactory to NetworkStatsService. 
NetworkStatsService is the only consumer of the data coming from
NetworkStatsFactory, but the factory itself is instantiated and
owned by NetworkManagementService.

Move it into NetworkStatsService instead.

Test: atest FrameworksNetTests
Change-Id: I52df1e545c646927952579da22845a12d1d7563b
 2019-06-26 19:29:51 +09:00
Remi NGUYEN VAN
e820c3bd36 [automerger skipped] Merge "Only show "Connected" note after opening portal" into qt-dev am: 09a8de5530 -s ours 
am: 203bde59b4 -s ours
am skip reason: change_id I99be7d312d020d242081971c7e522023bbbab072 with SHA1 844ea18005 is in history

Change-Id: I8ec96985154e8fedc64f6f9233930f2d1a9ee581
 2019-06-26 01:15:05 -07:00
Remi NGUYEN VAN
f611aeefd4 [automerger skipped] Merge "Only show "Connected" note after opening portal" into qt-dev am: 09a8de5530 
am: ce3b7eadad -s ours
am skip reason: change_id I99be7d312d020d242081971c7e522023bbbab072 with SHA1 844ea18005 is in history

Change-Id: I087da26c8b643e8dad055955388c1b032a73f558
 2019-06-26 01:07:44 -07:00
Remi NGUYEN VAN
ce3b7eadad Merge "Only show "Connected" note after opening portal" into qt-dev 
am: 09a8de5530

Change-Id: I0113a80675f93cb95b3dccaba9777bfc31715130
 2019-06-26 00:59:48 -07:00