drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
284,041 Commits 1 Branch 0 Tags
Commit Graph

3581 Commits

Author SHA1 Message Date
Erik Kline
dea2371e71 Merge "Address some comments on IpManagerTest" 
am: b2afa1ede5

Change-Id: Ic986c23c693757b8311e0de0c0a94281db67f62d
 2017-03-14 06:08:34 +00:00
Erik Kline
246bc1f795 Address some comments on IpManagerTest 
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 26991160
Change-Id: Ib543874188537e31422206d67d1760762a7c85cd
 2017-03-14 13:02:49 +09:00
Erik Kline
cf07e0d541 Merge "Skeleton of an IpManagerTest" 
am: db4333a2c2

Change-Id: I5817c2458c222afb85389deaf22b43d245577b2a
 2017-03-14 03:11:15 +00:00
Erik Kline
aa95ae57ec Skeleton of an IpManagerTest 
Test: as follows
    - biult (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 26991160
Change-Id: Idddddf0c1a7a8d0a8acff8a5526b02a533d5f3ec
 2017-03-14 10:19:52 +09:00
Joachim Sauer
260b81aaf2 Merge "Renaming Czech Republic to Czechia." 
am: 33bade08de

Change-Id: Ie76ebb1bd53eb4993f0d01c7d3b5ba7dae9c6504
 2017-03-08 17:40:13 +00:00
Joachim Sauer
33bade08de Merge "Renaming Czech Republic to Czechia." 2017-03-08 17:31:27 +00:00
Paul Duffin
b29311bbba Merge "Replace usages of littlemock with mockito" 
am: 0a11c83016

Change-Id: I1456ae3d07d396080a817de01796eefc71230981
 2017-03-08 14:59:26 +00:00
Paul Duffin
9df5d4f715 Replace usages of littlemock with mockito 
Littlemock appears to have been created as an alternative to
Mockito that would work on Android. Given that Mockito does
now work on Android and Littlemock has had no activity since
Aug 2012 it seems prudent to switch over to use Mockito instead.

https://code.google.com/archive/p/littlemock/

This is being done as part of the work to upgrade Mockito.

Bug: 32912773
Test: Build and install affected APKs, test using am instrument
Change-Id: Id0e57880ea66c5681b664bbfb534c96410544665
 2017-03-07 13:55:52 +00:00
Erik Kline
0f901af920 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" 
am: 75dfc5bd91

Change-Id: I79b9323be242ed5d2bf83962f78c613a465a20b8
 2017-03-07 13:33:29 +00:00
Erik Kline
465c46d555 request{LinkProperties,NetworkCapabilities} no longer needed 
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering toggling between WiFi and mobile
Bug: 32163131
Change-Id: I57edf5114b6361f320577c7870e40f8b3cdf74ce
 2017-03-07 17:18:06 +09:00
Erik Kline
e0a62a4398 Merge "Always send all available state when calling onAvailable()." 
am: affbb8b6a9

Change-Id: I81e70fecf060a4103b51084a60a32c78f6219f6b
 2017-03-07 06:00:09 +00:00
Erik Kline
c75d4fad22 Always send all available state when calling onAvailable(). 
The state that needs to be transferred includes:
    - NetworkCapabilities
    - LinkProperties
    - whether the network is currently suspended

Additionally:
    - Rename notifyNetworkCallback() to notifyNetworkAvailable()
      in order to clarify its real function.
    - fix previous copy/paste error in unittest

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - USB tethering with mobile and Wi-Fi upstream toggling
Bug: 32163131
Change-Id: Ib4460bcd5d08863a9feac9e8ab41a238897bb3ea
 2017-03-07 12:57:26 +09:00
Hugo Benichi
4cf199383f Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499." 
am: 704520c392

Change-Id: Ia0ae78f8406b81377491407cf5ef8ca339952def
 2017-03-06 12:30:05 +00:00
Hugo Benichi
649e32484e Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499. 
This reverts commit faa70976b490116323107166f90fdd944c5bdc77.

Change-Id: I86c07c113f24753be7c977e6d7f570b99391e1b5
 2017-03-06 06:16:51 +00:00
Hugo Benichi
5983a772cb Merge "ConnectivityManager: no double NetworkCallback registration" 
am: 06a192fa49

Change-Id: I250fa7d3c5e37a66caa41cc898a44bcb18c9a0c4
 2017-03-02 08:04:03 +00:00
Hugo Benichi
faa70976b4 ConnectivityManager: no double NetworkCallback registration 
Test: new test in ConnectivityManagerTest
Bug: 20701525
Change-Id: I205333d31d43e6e6c7fe704ce63b458065f345ce
 2017-03-02 15:19:37 +09:00
Erik Kline
47d8385184 Merge "Also test for additional NetworkCallback calls" 
am: dff6c5c30d

Change-Id: I00b3f7be06bde167872d0cdefe940cda5e138846
 2017-03-01 11:03:08 +00:00
Erik Kline
1d3db32708 Also test for additional NetworkCallback calls 
Specifcally:
    - onCapabilitiesChanged
    - onLinkPropertiesChanged
    - onNetworkSuspended

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131

Change-Id: Ie0f7c8ac21313b11980bb335c89ecde6fd8e311c
 2017-03-01 18:24:36 +09:00
Erik Kline
279a4feb72 Merge "Update UpstreamNetworkMonitor to use custom Handlers" 
am: 35c89886c2

Change-Id: I76433822a9b7c124e4b7cfcf2a20cb0e43a60199
 2017-02-24 08:15:19 +00:00
Erik Kline
b583b03675 Update UpstreamNetworkMonitor to use custom Handlers 
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32130437
Bug: 32163131

Change-Id: I2bc3f87cdf7fa6392b4750eb8adb4ea33c6a3f43
 2017-02-24 13:06:51 +09:00
Fredrik Roubert
45ded8f6ba Renaming Czech Republic to Czechia. 
Bug: 34964100
Test: ?
Change-Id: Ifbf0a52d15e3d735404be49c6934775589ecdfd6
 2017-02-23 17:30:14 +01:00
Hugo Benichi
9355bce0c3 Merge "IP connectivity metrics: delete obsolete logger service" am: 37e3f22c2e am: c54962a4bd 
am: 9c2b6afa2f

Change-Id: I5f8cd508812d9532778c2f1f019308a4b8d8ee33
 2017-02-17 00:18:35 +00:00
Hugo Benichi
9c2b6afa2f Merge "IP connectivity metrics: delete obsolete logger service" am: 37e3f22c2e 
am: c54962a4bd

Change-Id: Iccc3ee97bd2ac267b312c6c7d9269ac02a2bd68e
 2017-02-17 00:09:11 +00:00
Hugo Benichi
c54962a4bd Merge "IP connectivity metrics: delete obsolete logger service" 
am: 37e3f22c2e

Change-Id: Ib335bc5e19c2c703d23267bf2835fc89fcf5a957
 2017-02-17 00:00:14 +00:00
Hugo Benichi
37e3f22c2e Merge "IP connectivity metrics: delete obsolete logger service" 2017-02-16 23:52:13 +00:00
Hugo Benichi
d22edc28f5 IP connectivity metrics: delete obsolete logger service 
Test: - runtest frameworks-net
      - manually verified $ adb shell dumpsys connmetrics
Bug: 32648597

Change-Id: I69f7dee5871508398d7f7209658a00c768e2d18e
 2017-02-15 17:12:58 +09:00
Erik Kline
d850804723 Merge "Verify duplicate upstream notifications are ignored" am: 3d57eb0bdc am: 02e71f6245 
am: 8055dafb08

Change-Id: I1e10adfba2ebb9f52e86d8b35f3d0b87134c0e91
 2017-02-14 09:49:56 +00:00
Erik Kline
8055dafb08 Merge "Verify duplicate upstream notifications are ignored" am: 3d57eb0bdc 
am: 02e71f6245

Change-Id: I0e62e4f6f371aa43eae1a0e5c62787c4e84ddd9a
 2017-02-14 09:45:56 +00:00
Erik Kline
02e71f6245 Merge "Verify duplicate upstream notifications are ignored" 
am: 3d57eb0bdc

Change-Id: Iff84a1a12714047b20408f03e3bb2252a463b74b
 2017-02-14 09:41:53 +00:00
Erik Kline
624bf3d7f6 Verify duplicate upstream notifications are ignored 
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest .../tethering/TetherInterfaceStateMachineTest.java passes
Bug: 32163131

Change-Id: I3c097d766fe4c416a8e3f02640809fe1199c6ef2
 2017-02-14 15:55:57 +09:00
Erik Kline
ea7e8f7352 Merge "Cleanup in the face of upstream error" am: ed6d75d5f3 am: 76e6f790db 
am: 663ec79cb2

Change-Id: Ib726fe85b816eccbc0beab555873b77f3454bc64
 2017-02-14 06:25:47 +00:00
Erik Kline
663ec79cb2 Merge "Cleanup in the face of upstream error" am: ed6d75d5f3 
am: 76e6f790db

Change-Id: I097318f3edc5257288d582a0f17744e1f984856c
 2017-02-14 06:21:44 +00:00
Erik Kline
76e6f790db Merge "Cleanup in the face of upstream error" 
am: ed6d75d5f3

Change-Id: If8dbf882bd8c4a8d53ae026d8f83a00a52590830
 2017-02-14 06:17:38 +00:00
Erik Kline
8ea45483fc Cleanup in the face of upstream error 
If either enableNat() or startInterfaceForwarding() fail, be sure
to cleanup any commands that might have succeeded.

Most of this change is a refactoring of cleanupUpstreamIface() into
two methods, one of which (cleanupUpstreamInterface()) is reused
in error handling scenarios.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug: 32031803
Bug: 32163131

Change-Id: Ia4d56e03beeab1908d8b8c2202e94992f1aa58a4
 2017-02-14 12:20:39 +09:00
Erik Kline
60d14c429b Merge "Add test coverage for cleanup bug to be fixed." am: 89e6bf0532 am: 0cca15ff88 
am: 3de5971b40

Change-Id: I470c481a0eebc9cadf134c73ece08803927f4ca2
 2017-02-13 12:08:11 +00:00
Erik Kline
3de5971b40 Merge "Add test coverage for cleanup bug to be fixed." am: 89e6bf0532 
am: 0cca15ff88

Change-Id: Ib5d1a6d6616b99a9e4f7cf0286ebc0a11d62bff8
 2017-02-13 12:02:48 +00:00
Erik Kline
0cca15ff88 Merge "Add test coverage for cleanup bug to be fixed." 
am: 89e6bf0532

Change-Id: I33347c8fc2bec5660b8e9c14a316f6d14a6cf8b1
 2017-02-13 11:57:37 +00:00
Erik Kline
a954be9563 Add test coverage for cleanup bug to be fixed. 
The test calls that need to pass but do not currently are commented out.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug: 32031803
Bug: 32163131

Change-Id: I68ed476920bef882f353d8e8a54c72120bc27002
 2017-02-13 17:38:34 +09:00
Erik Kline
c700509ade Merge "Add ConnectivityManager.networkCapabilitiesForType()" am: c313123afe am: 6f32aa0259 
am: 7196e935a8

Change-Id: I2ab05143299f13012dc2a88efca52160e08c6d97
 2017-02-02 07:32:09 +00:00
Erik Kline
7196e935a8 Merge "Add ConnectivityManager.networkCapabilitiesForType()" am: c313123afe 
am: 6f32aa0259

Change-Id: I6828bc3bb094ca8597ca2d8538045758638c374f
 2017-02-02 07:27:13 +00:00
Erik Kline
6f32aa0259 Merge "Add ConnectivityManager.networkCapabilitiesForType()" 
am: c313123afe

Change-Id: I0ad50fbf38f11b383fd889dc598cfddd47051477
 2017-02-02 07:22:05 +00:00
Treehugger Robot
c313123afe Merge "Add ConnectivityManager.networkCapabilitiesForType()" 2017-02-02 07:15:05 +00:00
Erik Kline
2ebea21074 Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5 am: 180a3d07a8 
am: d85f448274

Change-Id: Ia629aa5dbdf10566c28525d9a05b096482db3f2d
 2017-02-02 05:25:05 +00:00
Erik Kline
d85f448274 Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5 
am: 180a3d07a8

Change-Id: I9f80a3ff713b4b00136808051a717509f600bb9a
 2017-02-02 05:20:05 +00:00
Erik Kline
180a3d07a8 Merge "Add test for repeated calls to registerMobileUpstreamRequest()" 
am: 603eefd5d5

Change-Id: I6b2a0d6df70df028ef9b8ff5d689c5a627d8daf8
 2017-02-02 05:15:23 +00:00
Erik Kline
35bf06c968 Add ConnectivityManager.networkCapabilitiesForType() 
This static method returns a NetworkCapabilities instance with
transports and capabilities set according to the given legacy type.

Also:
    - add NetworkRequest.Builder.setCapabilities(), to be able to use
      the NetworkCapabilities instances returned from the above
    - update UpstreamNetworkMonitor to make immediate use of this

Test: as follows
    - build (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - WiFi to DUN upstream tethering works
Bug: 32163131

Change-Id: Idfe1ddd2815c355cbf27cf29eb0e3de177de84e9
 2017-02-02 11:07:59 +09:00
Erik Kline
7462f467c1 Add test for repeated calls to registerMobileUpstreamRequest() 
Test: as follows
    - built
    - flashed
    - booted
    - runtest framework-net passes
Bug: 32163131

Change-Id: I6d2519601b7a9dcfda2917118214a7ceb9dbbb7f
 2017-02-01 21:30:15 +09:00
Lorenzo Colitti
6e7f7dc643 ConnectivityServiceTest: remove remaining poll loops. am: d2706127d0 am: 54e9050710 
am: 67d6d41954

Change-Id: I31681e1248721704a9b792962a2ef5955e375e93
 2017-02-01 03:01:52 +00:00
Lorenzo Colitti
4fc1296cef Remove assertEventuallyTrue as it's unnecessary. am: 30145d755c am: 90a70cac26 
am: 90babed246

Change-Id: Ib16f54aeaa783a6e26a9d80e61388cbd9ecd9bd3
 2017-02-01 03:00:41 +00:00
Lorenzo Colitti
d526434f05 Rename AvoidBadWifiTracker to MultinetworkPolicyTracker am: 58ebe1c6f1 am: 0bc8070fce 
am: 338241de94

Change-Id: I91f1338f3488cfc60eef0c2147aa7b1d61107cdd
 2017-02-01 02:59:42 +00:00