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
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
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
370e2925d0
Merge "Remove all static members from NetworkStatsFactory." am: 63f94f411b am: 5409264cee am: 21ea4bcc96
...
am: d4ed795ad3
2019-06-27 20:14:02 -07: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
Chalard Jean
f0eed3483e
Merge "Revert "Simplify Exception expressions in CSTest"" am: 0fd0e96a40 am: 60422b8e88 am: e2eb03b140
...
am: e6ab740f9e
2019-06-27 12:56:37 -07:00
Lorenzo Colitti
5bdd833bb6
Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." am: c657dd301f am: 92292f556b am: fbac9eefb8
...
am: 56a50e0bb5
2019-06-27 12:22:55 -07:00
Chalard Jean
a5fbbd8754
Merge "Simplify Exception expressions in CSTest" am: afbf997ad5 am: 8e3bf0f8e3 am: c421078227
...
am: 29e549bf23
2019-06-27 12:19:17 -07:00
Chalard Jean
712ae11bac
Merge "Unify assertThrows" am: 0272942bca am: 3f21f94616 am: 546cdc06f8
...
am: b78f61ed35
2019-06-27 12:18:17 -07:00
Remi NGUYEN VAN
d6e4f7130c
[automerger skipped] Merge "Only show "Connected" note after opening portal" into qt-dev am: 09a8de5530 -s ours am: 203bde59b4 -s ours
...
am: e820c3bd36844ea18005
2019-06-27 10:36:55 -07:00
Remi NGUYEN VAN
7b2e23a39e
[automerger skipped] Merge "Only show "Connected" note after opening portal" into qt-dev am: 09a8de5530 am: ce3b7eadad -s ours
...
am: f611aeefd4844ea18005
2019-06-27 10:35:37 -07:00
Chalard Jean
e6ab740f9e
Merge "Revert "Simplify Exception expressions in CSTest"" am: 0fd0e96a40 am: 60422b8e88
...
am: e2eb03b140
2019-06-27 10:04:04 -07:00
Lorenzo Colitti
56a50e0bb5
Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." am: c657dd301f am: 92292f556b
...
am: fbac9eefb8
2019-06-27 09:26:02 -07:00
Chalard Jean
29e549bf23
Merge "Simplify Exception expressions in CSTest" am: afbf997ad5 am: 8e3bf0f8e3
...
am: c421078227
2019-06-27 09:23:14 -07:00
Chalard Jean
b78f61ed35
Merge "Unify assertThrows" am: 0272942bca am: 3f21f94616
...
am: 546cdc06f8
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
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: 203bde59b4844ea18005
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: ce3b7eadad844ea18005
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
Remi NGUYEN VAN
203bde59b4
[automerger skipped] Merge "Only show "Connected" note after opening portal" into qt-dev
...
am: 09a8de5530 -s ours
am skip reason: change_id I99be7d312d020d242081971c7e522023bbbab072 with SHA1 844ea18005
2019-06-26 00:59:40 -07:00
