Commit Graph

7238 Commits

Author SHA1 Message Date
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.

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
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
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

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

Change-Id: I91ffbbb031d9ff6f36c51bc567ac6ce22386d07c
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
Lorenzo Colitti
d8b7696d4a 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
7297e541f6 Merge "Simplify Exception expressions in CSTest" 2019-06-28 07:19:20 +00:00
Chalard Jean
f8f6cc81ec Simplify Exception expressions in CSTest
Test: CSTest
Change-Id: Ie9b9fc334b85836bf156bda71e54e8d30885b82a
2019-06-28 14:22:30 +09:00
Lorenzo Colitti
cd58da902d Merge "Remove all static members from NetworkStatsFactory." am: 63f94f411b am: 5409264cee
am: efb2eba374

Change-Id: I7f787d14b7c7dee7a77dbed84266f8192c21c446
2019-06-27 19:56:01 -07:00
Lorenzo Colitti
efb2eba374 Merge "Remove all static members from NetworkStatsFactory." am: 63f94f411b
am: 5409264cee

Change-Id: Iada14a1fea74197014e75a1112c7a5b35d6b1a1d
2019-06-27 19:40:01 -07:00
Chalard Jean
883be51e1e Merge "Revert "Simplify Exception expressions in CSTest"" am: 2c6ad5875c am: 60422b8e88
am: 5e98a2b431

Change-Id: If0a6e45f1aee111de0f0f9eee8ed310c2ef47225
2019-06-27 10:04:04 -07:00
Lorenzo Colitti
affb3937d1 Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." am: 1621af96c7 am: 92292f556b
am: 2ab2680910

Change-Id: Ibe2fcacb3779b3c6bc484fe6f398475bf5b6383b
2019-06-27 09:26:02 -07:00
Chalard Jean
7e397a0cec Merge "Simplify Exception expressions in CSTest" am: 064034f7c1 am: 8e3bf0f8e3
am: b7a51c4a72

Change-Id: Id2bf1ddd6785057292678a1a915a3bf35a7515f7
2019-06-27 09:23:14 -07:00
Chalard Jean
dae927dbf2 Merge "Unify assertThrows" am: a4091edc99 am: 3f21f94616
am: 6ac2006af1

Change-Id: I47dd5930dcf10edd22a4964f2fcc979ad901d723
2019-06-27 09:22:21 -07:00
Chalard Jean
5e98a2b431 Merge "Revert "Simplify Exception expressions in CSTest"" am: 2c6ad5875c
am: 60422b8e88

Change-Id: I80d94fa746d533a83e3ce01377dabd2aab0c3229
2019-06-27 02:53:23 -07:00
Lorenzo Colitti
f8a48e1857 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
2ab2680910 Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." am: 1621af96c7
am: 92292f556b

Change-Id: If897c9c95fc8571949183c45a99a5c28cb032ebb
2019-06-27 01:31:46 -07:00
Chalard Jean
2c6ad5875c Merge "Revert "Simplify Exception expressions in CSTest"" 2019-06-27 08:30:57 +00:00
Chalard Jean
7100e08dde Revert "Simplify Exception expressions in CSTest"
This reverts commit 85d0c9c0b2.

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
b7a51c4a72 Merge "Simplify Exception expressions in CSTest" am: 064034f7c1
am: 8e3bf0f8e3

Change-Id: I32182775bf36918438868c5b77d8d1aa995c788a
2019-06-27 01:11:02 -07:00
Chalard Jean
6ac2006af1 Merge "Unify assertThrows" am: a4091edc99
am: 3f21f94616

Change-Id: If349f647b34a71bc4eb1ba25ca18d543437eb969
2019-06-27 01:05:16 -07:00
Lorenzo Colitti
1621af96c7 Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." 2019-06-27 07:53:30 +00:00
Chalard Jean
064034f7c1 Merge "Simplify Exception expressions in CSTest" 2019-06-27 07:09:36 +00:00
Chalard Jean
a4091edc99 Merge "Unify assertThrows" 2019-06-27 07:08:59 +00:00
Lorenzo Colitti
2fae0b6a4b 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
c60936d4d3 [automerger skipped] Merge "Only show "Connected" note after opening portal" into qt-dev am: 09a8de5530 -s ours
am: ee36403e14 -s ours
am skip reason: change_id I99be7d312d020d242081971c7e522023bbbab072 with SHA1 45955ea176 is in history

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

Change-Id: I087da26c8b643e8dad055955388c1b032a73f558
2019-06-26 01:07:44 -07:00
Remi NGUYEN VAN
d58de80141 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
ee36403e14 [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 45955ea176 is in history

Change-Id: I50b62b92261b7386d7a15ab0e876661e8c4b0bac
2019-06-26 00:59:40 -07:00
Remi NGUYEN VAN
345e6cbf5f Only show "Connected" note after opening portal
The "Connected" notification would be shown every time a network
validates after being identified as a captive portal. This causes issues
on networks that have auto-login mechanisms, as a high priority
notification would be shown even though the user was not interacting
with the phone.

The "Connected" notification is intended to confirm to the user that
they successfuly logged in (manually), so only show it after the user
opens the portal on the network.

Bug: 134124044
Test: Flashed, connected to portal: notification shown
      Opened portal from command line + revalidate: no notification
      Tests passing with change, failing without
Merged-In: I99be7d312d020d242081971c7e522023bbbab072
Merged-In: I7dc1b3a313b255fe89313efb9117bb160efdb533
(cherry picked from commit 0b5a4d862190320d285413b1feb921144fee8420)

Change-Id: I67c124cc34f09c2f186706b5cec839f60d00a90a
2019-06-26 01:55:51 +00:00
Remi NGUYEN VAN
a2d4439691 Merge "Only show "Connected" note after opening portal" am: 9840b88ffc am: bad4d1c6e9
am: 45955ea176

Change-Id: I2eaa815beba4240a8258202fc5fcaac1547cd1bc
2019-06-25 09:58:44 -07:00
Remi NGUYEN VAN
45955ea176 Merge "Only show "Connected" note after opening portal" am: 9840b88ffc
am: bad4d1c6e9

Change-Id: I99be7d312d020d242081971c7e522023bbbab072
2019-06-25 09:40:54 -07:00
Remi NGUYEN VAN
9840b88ffc Merge "Only show "Connected" note after opening portal" 2019-06-25 15:20:33 +00:00
Chalard Jean
85d0c9c0b2 Simplify Exception expressions in CSTest
Test: CSTest
Change-Id: I2c7d9e3092497526ab7d87b40a508f2d4bc3d7a2
2019-06-25 20:40:41 +09:00
Chalard Jean
e176887b8d Unify assertThrows
Test: atest FrameworksTestsNet NetworkStackTests
Change-Id: Ib6d5d2577a5b95f90857d8d146b00af516e9944d
2019-06-25 20:40:39 +09:00