Commit Graph

3787 Commits

Author SHA1 Message Date
Hugo Benichi
2e7f976c87 Merge "Move NsdServiceTest to correct directory" am: 72b5cdc1a7 am: ca9fcb79f6 am: ecf4267889
am: 1314c7e54f

Change-Id: I5ca076ba73c470c301502a73e5cec66c6283b53d
2017-05-24 07:20:05 +00:00
Hugo Benichi
1314c7e54f Merge "Move NsdServiceTest to correct directory" am: 72b5cdc1a7 am: ca9fcb79f6
am: ecf4267889

Change-Id: Ib4e100fc8219b58ab7850407735a444dad3ec153
2017-05-24 07:15:09 +00:00
Treehugger Robot
72b5cdc1a7 Merge "Move NsdServiceTest to correct directory" 2017-05-24 06:47:30 +00:00
Hugo Benichi
d41cc755eb Move NsdServiceTest to correct directory
Test: no functional change
Bug: 62044295
Change-Id: Iad3af646e8d252f84978d1a367878a78c2869982
2017-05-24 14:18:48 +09:00
Hugo Benichi
38ae2dc45b Merge "Fix NetworkStatsObserversTest" am: 3ba0e6ce34 am: 25282c3e38 am: 814351c843
am: b6a61b27a0

Change-Id: Ib63c7411e28e48201217c4a164c41d4d3223ca51
2017-05-23 14:27:13 +00:00
Hugo Benichi
b6a61b27a0 Merge "Fix NetworkStatsObserversTest" am: 3ba0e6ce34 am: 25282c3e38
am: 814351c843

Change-Id: Ice4bb8de4267cba7a15a60838e165fab5ebade72
2017-05-23 14:18:30 +00:00
Hugo Benichi
3ba0e6ce34 Merge "Fix NetworkStatsObserversTest" 2017-05-23 11:29:48 +00:00
Hugo Benichi
741972dcdc Merge "Fix NetworkStatsAccessTest" am: e08c3bc8bd am: cdb75d321b am: 85afabc4ec
am: 71b964f828

Change-Id: I838ae489f7d7a287291a1fc14d9e2f816cc29d14
2017-05-23 07:09:25 +00:00
Hugo Benichi
71b964f828 Merge "Fix NetworkStatsAccessTest" am: e08c3bc8bd am: cdb75d321b
am: 85afabc4ec

Change-Id: I60f9d8867655a6aa24ee192c772d4c26a96c9bcd
2017-05-23 07:02:54 +00:00
Hugo Benichi
1d61a60a17 Merge "ConnectivityManager: simplify callback handler" am: 7739baa030 am: 7bce658dd6 am: a67fb638fa
am: 941fdb851e

Change-Id: I8d2373bfd1ae3fabab8f556d2b8c8cfa6310818c
2017-05-23 06:43:16 +00:00
Hugo Benichi
e08c3bc8bd Merge "Fix NetworkStatsAccessTest" 2017-05-23 06:43:07 +00:00
Hugo Benichi
941fdb851e Merge "ConnectivityManager: simplify callback handler" am: 7739baa030 am: 7bce658dd6
am: a67fb638fa

Change-Id: I3934666df4a02101351993f7f83fb0a42124a2f5
2017-05-23 06:37:24 +00:00
Treehugger Robot
7739baa030 Merge "ConnectivityManager: simplify callback handler" 2017-05-23 06:16:49 +00:00
Hugo Benichi
02432e3833 Merge "NsdService: test coverage for client requests." 2017-05-23 05:54:07 +00:00
Hugo Benichi
94a2075265 Merge "ConnectivityServiceTest: fix flakyness" am: fd3f172df8 am: 004f36d5bc am: eb9d0f16aa
am: 2244ca0741

Change-Id: I4225fabd1b9af92a7c688e2cfbab3b20e58c53dd
2017-05-23 05:03:12 +00:00
Hugo Benichi
2244ca0741 Merge "ConnectivityServiceTest: fix flakyness" am: fd3f172df8 am: 004f36d5bc
am: eb9d0f16aa

Change-Id: Ic792060aafb5aa8b485054be18c3dba82bb15a3b
2017-05-23 04:56:41 +00:00
Hugo Benichi
fd3f172df8 Merge "ConnectivityServiceTest: fix flakyness" 2017-05-23 04:35:11 +00:00
Hugo Benichi
6cb5dda62f NsdService: test coverage for client requests.
Adding coverage for:
  - NsdManager client disconnection
  - in-flight request GC

Test: new test passes
Bug: 37013369, 33298084
Bug: 38503832

(cherry picked from commit fc28684dda)

Change-Id: I02aca772d88306acae09db739ced7a2b1119b72b
2017-05-23 12:53:55 +09:00
Hugo Benichi
0a7d45a271 Merge "Merge "ConnectivityManager: improve argument validation" am: bdc00cdaa0 am: 0187514f74 am: b800e8520e" into oc-dev-plus-aosp
am: dd06c9461b

Change-Id: I2a9ba4202ffca20fa4931680f9e3bf4313dcfb6f
2017-05-23 03:52:00 +00:00
Hugo Benichi
4b11cd92ed Merge "ConnectivityManager: improve argument validation" am: bdc00cdaa0 am: 0187514f74
am: b800e8520e

Change-Id: Idfc0938025c633c89f5bfddd88b3721876d085ef
2017-05-23 03:41:52 +00:00
Treehugger Robot
bdc00cdaa0 Merge "ConnectivityManager: improve argument validation" 2017-05-23 03:14:29 +00:00
Hugo Benichi
3b92699672 ConnectivityManager: simplify callback handler
Bug: 36701874
Test: $ runtest frameworks-net
Change-Id: I4d5f08903a54f8dced7cb6ae86703847b908b784
2017-05-23 10:39:46 +09:00
Hugo Benichi
ff4bf6017f ConnectivityManager: improve argument validation
Using Preconditions and dedicated static methods for checking arguments
to improve error stack traces without error messages.

Test: covered by previously added unit test
Bug: 36701874
Change-Id: Id872b2c887a4bca43a8c3644622add1c2ee57c6d
2017-05-23 10:39:45 +09:00
Hugo Benichi
e0df1bd284 Fix NetworkStatsObserversTest
This patch fixes several spurious unit tests in
NetworkStatsObserversTest by using the updated waitForIdleHandler of
ConnectivityServiceTest. More specifically this fixes the following
tests:
  - testUnregister_knownRequest_releasesCaller
  - testUpdateStats_deviceAccess_notifies
  - testUpdateStats_userAccess_usageSameUser_notifies
  - testUpdateStats_defaultAccess_notifiesSameUid

This patch also removes the dummy message with type -1 sent at the end
of tests in NetworkStatsObserversTest and the associated assert, because
nothing is exercised or asserted immediately after.

This patch also updates NetworkStatsObserversTest to not depend on the
deprecated junit.framework.TestCase.

Bug: 32561414
Test: runtest -x frameworks/base/tests/../NetworkStatsObserversTest.java
Change-Id: I4fc909ee9bacc964c859fa7a3db34f9dc86b89cf
2017-05-23 10:18:41 +09:00
Hugo Benichi
728aabcdc0 Fix NetworkStatsAccessTest
This patch fixes NetworkStatsAccessTest by taking into account
DEVICESUMMARY which was added in commit
3a8b343ce5220086c4f71e63f5d42f2d28434c4b.

Doing $ git revert 3a8b343ce5220086c4f71e63f5d42f2d28434c4b shows that
the existing assertions of NetworkStatsAccessTest passed before that
commit.

This patch also changes NetworkStatsAccessTest to use up-to-date testing
style and not depend on the deprecated junit.framework.TestCase.

Bug: 32561414
Test: runtest -x frameworks/base/../NetworkStatsAccessTest.java
Change-Id: Ib78f137578cf35e1c766b377b7f812a09173c49e
2017-05-23 10:18:41 +09:00
Hugo Benichi
bac93e4852 ConnectivityServiceTest: fix flakyness
This patch attempts to fix the remaining spurious failures in
ConnectivityServiceTest, which have two causes:
 - waitForIdle() does not take into account the NetworkAgents handlers.
 - the deadlines in testRequestBenchmark are sometimes exceeded.

To fix the first issue, waitForIdle() is moved to a test level instance
method and also calls waitForIdleHandler on any non null
MockNetworkAgent. This is expected to fix spurious errors for the
following tests:
  - testMobildeDataAlwaysOn
  - testLingering
  - testPacketKeepAlive
  - testMMSonWiFi

To fix the second issue, the deadlines for testRequestBenchmark are
extended by 10ms. Also, the failure message is made more actionable by
providing the total time it took for the operation, instead of printing
the number of dispatches that were achieved before the deadline.

Bug: 32561414
Test: tests pass many times in a row (~500).
Change-Id: Id33c6ac1edfb0b89634fa7789dccb2da237e2709
2017-05-23 10:18:41 +09:00
Hugo Benichi
e3676f6223 Merge "Address ConnectivityManager API comments." am: a70025781f am: b57db6ef97 am: 08ab9ea526
am: f62523e6dc

Change-Id: I4ba08fdfca51cbc11866e941dab76f2926f796b1
2017-05-19 23:46:46 +00:00
Hugo Benichi
f62523e6dc Merge "Address ConnectivityManager API comments." am: a70025781f am: b57db6ef97
am: 08ab9ea526

Change-Id: I8e5e44043bb7efde3e21650e7edf3f121aff1e6e
2017-05-19 23:36:09 +00:00
Hugo Benichi
a70025781f Merge "Address ConnectivityManager API comments." 2017-05-19 23:05:57 +00:00
Hugo Benichi
a2ab54732e Merge "Add a method to start the captive portal login app." am: 9e44f73ed7 am: f238a96172 am: 6246ddc338
am: 5f5f8631ad

Change-Id: I29f04d352d601da18df193f3f46b2f6ff60d7ffd
2017-05-19 03:05:31 +00:00
Hugo Benichi
5f5f8631ad Merge "Add a method to start the captive portal login app." am: 9e44f73ed7 am: f238a96172
am: 6246ddc338

Change-Id: I0f5d39394d35d2977c81b704ded1d1119bcf47a7
2017-05-19 02:56:58 +00:00
Lorenzo Colitti
358435e4e4 Merge "Add test coverage for explicitlySelected networks." am: 5466a9e14b am: 3d55c5539c am: b7535c86a0
am: aa92f9e874

Change-Id: Ie104d3b939e99f67dd3267e16f6c27c403162453
2017-05-19 02:43:31 +00:00
Lorenzo Colitti
aa92f9e874 Merge "Add test coverage for explicitlySelected networks." am: 5466a9e14b am: 3d55c5539c
am: b7535c86a0

Change-Id: I4caf9f55edeb51365293558db9d7d028b61c501c
2017-05-19 02:34:58 +00:00
Hugo Benichi
9e44f73ed7 Merge "Add a method to start the captive portal login app." 2017-05-19 02:29:21 +00:00
Lorenzo Colitti
5466a9e14b Merge "Add test coverage for explicitlySelected networks." 2017-05-19 02:05:55 +00:00
Lorenzo Colitti
7868c98fea Add a method to start the captive portal login app.
Bug: 36203355
Bug: 36656914
Test: ConnectivityServiceTest (including new test) passes
Change-Id: Ide82858af67024623560ab79beea27c201b63447
Merged-In: I82a9a9a8da47870ba3f1bbef5941b37e970c844f

(cherry picked from commit 755e796e5e)
2017-05-19 00:58:41 +00:00
Erik Kline
a9da29975b Merge "Expand logging capabilities of Tethering subsystem" am: cbe63224b0 am: 96f9371a66 am: 945ff184c2
am: e40047ec69

Change-Id: I2644f518304a03da469fb9c2aa01a6d8f1a97901
2017-05-18 04:04:57 +00:00
Erik Kline
e40047ec69 Merge "Expand logging capabilities of Tethering subsystem" am: cbe63224b0 am: 96f9371a66
am: 945ff184c2

Change-Id: Ia9d15f0dcc49ce070f8684eb8c8481310859faa5
2017-05-18 03:54:30 +00:00
Hugo Benichi
7e17f5a6e0 Merge "Fix NetworkNotificationManagerTest" am: c13a80deee am: 13f0d10115 am: 31c566037b
am: acef18b0aa

Change-Id: I000077352ab0e1af7209a266be0309607034dbea
2017-05-18 03:50:46 +00:00
Hugo Benichi
acef18b0aa Merge "Fix NetworkNotificationManagerTest" am: c13a80deee am: 13f0d10115
am: 31c566037b

Change-Id: Ib880777290f74eaa565839632eb7518642fcc4f3
2017-05-18 03:44:20 +00:00
Treehugger Robot
cbe63224b0 Merge "Expand logging capabilities of Tethering subsystem" 2017-05-18 03:25:30 +00:00
Hugo Benichi
1fb086dd8a Merge "Move NetworkNotificationManagerTest to tests/net" am: c6464fad2f am: 9fdc903af7 am: 777bf77c2c -s ours
am: b0ec728a3c

Change-Id: Ibba873042627166120f4040896c58e96bff2b085
2017-05-18 02:47:54 +00:00
Hugo Benichi
b0ec728a3c Merge "Move NetworkNotificationManagerTest to tests/net" am: c6464fad2f am: 9fdc903af7
am: 777bf77c2c  -s ours

Change-Id: I0f63e4f29228a404ec0dac3571b2474806e4c8d6
2017-05-18 02:40:26 +00:00
Hugo Benichi
08528b224b Fix NetworkNotificationManagerTest
The testNotificationsShownAndCleared test was not doing anything
because the list of notification to show was always empty.

This patch fixes this issue and actually makes the test loop on
non-empty collections, and also fixes another ordering issue in
assertions themselves, hidden until now by the first issue.

Bug: 32561414
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
Merged-In: I4837b1175d7c9133e9156e33acaa1e7e3341cc62
Change-Id: Ia30587bd68a87b83b62f57eeeb28fef7d95dbf81

(cherry picked from commit 913556e68e)
2017-05-18 11:08:31 +09:00
Hugo Benichi
c6464fad2f Merge "Move NetworkNotificationManagerTest to tests/net" 2017-05-18 02:01:40 +00:00
Hugo Benichi
9a7a008037 Merge "Finish moving NetworkStats tests to tests/net" am: d72f5f7c9a am: cd821b231a am: 544bcbe78e
am: 5019e0b10f

Change-Id: I663f5ae4f1e15bd39e8ed927ac71958818452967
2017-05-18 00:57:00 +00:00
Hugo Benichi
5019e0b10f Merge "Finish moving NetworkStats tests to tests/net" am: d72f5f7c9a am: cd821b231a
am: 544bcbe78e

Change-Id: I5d9a01a5804a7cc6289253db09078ede00fc0dc5
2017-05-18 00:48:14 +00:00
Erik Kline
ef8bd29f51 Expand logging capabilities of Tethering subsystem
Introduce a SharedLog that can be shared among all Tethering
components.  All log entries go to the same log, and each includes
its subsystem name.  Additionally, all entries emitted to the
system log shared the same tag, so can easily be watched.

More subsystems can inherit a SharedLog, but to minimize cherry-pick
conflicts we limit ourselves to these changes only.

Test: as follows
    - built
    - flashed
    - booted
    - log output observed via dumpsys
    - runtest frameworks-net passes
Bug: 32163131
Bug: 36988090
Bug: 38218697
Change-Id: I1229d4c55987402d84b0d4a2c8a595e0c829aa3e
2017-05-18 09:46:45 +09:00
Hugo Benichi
d72f5f7c9a Merge "Finish moving NetworkStats tests to tests/net" 2017-05-18 00:09:54 +00:00
Erik Kline
7194d9773f Merge "Add tethering offload HAL call via JNI" am: adb6e7b60b am: f421d60824 am: c967d56ad7 -s ours
am: 1302059404  -s ours

Change-Id: Iab8e98fdc4d7e4cf682dd4dffec3d64e6cef2556
2017-05-17 18:23:09 +00:00