Hugo Benichi
0c9a9404aa
IpManager: define InitialConfiguration
...
This patch adds a InitialConfiguration class to IpManager for specifying
IP information in IpManager ProvisioningConfiguration at IpManager
startup.
At the moment this InitialConfiguration is not used, but is validated in
startProvsiioning if ProvisioningConfiguration includes one. It will be
integrated into IpManager IP provisioning logic in follow-up patches.
This patch also includes an example of data driven unit tests using a
table of test case. The highlights of this methodology are:
1) easy extensibility for new test case,
2) rich and informative error messages,
Unfortunately Java support for inlined data structure literals is poor
and some companion static methods for data generation are required for
enabling this methodology.
Bug: 62988545
Test: added new test in FrameworksNetTests,
$ runtest frameworks-net
$ runtest frameworks-wifi
Change-Id: I060b02603af7d73a6407df89344bf0c000574af2
2017-07-13 22:42:50 +09:00
Andreas Gampe
7c89e296e4
Merge "Connectivity: Fix format arguments" am: ba8ab362ad am: 9ad55e3591 am: ce4c57fd0e
...
am: 378c299abe
2017-07-12 05:08:02 +00:00
Andreas Gampe
378c299abe
Merge "Connectivity: Fix format arguments" am: ba8ab362ad am: 9ad55e3591
...
am: ce4c57fd0e
Change-Id: Ia789f019394b7870994fcce8e64dee3b0501f7c1
2017-07-12 05:00:56 +00:00
Andreas Gampe
9ad55e3591
Merge "Connectivity: Fix format arguments"
...
am: ba8ab362ad
Change-Id: I844c7d1faea3dcc90cf9816cae984277d7525f15
2017-07-12 04:48:10 +00:00
Andreas Gampe
14c57f3a15
Connectivity: Fix format arguments
...
Fix missing argument.
Bug: 19797138
Test: m
Change-Id: I5fdd2a453c0d7422e8c3e79c8dce2d0800ec45e9
2017-07-11 18:21:15 -07:00
Hugo Benichi
da8d3a8571
Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master am: 6ab950dd5f am: 6659fdba55 -s ours
...
am: 4bf89e5ff9
2017-07-11 10:34:14 +00:00
Hugo Benichi
4bf89e5ff9
Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master am: 6ab950dd5f
...
am: 6659fdba55 -s ours
Change-Id: I30a343b25381f201cad4bff45df4ab6a1cf38e34
2017-07-11 10:24:15 +00:00
Robert Quattlebaum
221ccf7ec5
NetworkCapabilities: Added support for TRANSPORT_LOWPAN
...
This change simply adds a new constant, `TRANSPORT_LOWPAN`, for
identifying low-power wireless networks like Thread.
Bug: b/33073713
Test: builds
Change-Id: I50d9b8df1a0270e06c28f001adf6c52a142a85af
Merged-In: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689
(cherry pick from commit 5bc95c5900
2017-07-11 15:52:37 +09:00
Android Build Merger (Role)
ede2dee5ca
Merge "Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6" into oc-dr1-dev-plus-aosp am: c29006c184"
2017-07-06 16:30:15 +00:00
Android Build Merger (Role)
f486e39193
Merge "Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6" into oc-dr1-dev-plus-aosp am: c29006c184"
2017-07-06 16:29:52 +00:00
Lorenzo Colitti
77e766715f
Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6" into oc-dr1-dev-plus-aosp
...
am: c29006c184
2017-07-06 16:29:04 +00:00
Lorenzo Colitti
b6557f920b
Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6" into oc-dr1-dev-plus-aosp
...
am: c29006c184
2017-07-06 16:28:32 +00:00
Android Build Merger (Role)
1e3e85ee0a
Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6 am: 2564b1c7cc"
2017-07-06 16:27:32 +00:00
Lorenzo Colitti
e29731636e
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6
...
am: 2564b1c7cc
2017-07-06 16:25:48 +00:00
Lorenzo Colitti
b403f8b992
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6
...
am: 2564b1c7cc
2017-07-06 16:25:24 +00:00
Android Build Merger (Role)
c29006c184
Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6" into oc-dr1-dev-plus-aosp
2017-07-06 16:10:57 +00:00
Lorenzo Colitti
5f7174a98b
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev
...
am: d2eef601f6
Change-Id: I8297ca8d29d3aab18884a35953b0021ec265ce26
2017-07-06 16:09:49 +00:00
Lorenzo Colitti
2564b1c7cc
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev
...
am: d2eef601f6
Change-Id: Ibc89ffd87fb87cd95f941b2bbd67469d961cb13e
2017-07-06 16:09:30 +00:00
Joel Scherpelz
ba37c6c7d8
Wakeup packet mark/mask configuration option
...
Rules will only be installed if a device specific config.xml overrides
the default values of mark and mask.
This change also fixes a bug where wakeup rules added by the wakeup
controller would never be removed because updateInterfaces() is not
invoked on wifi network change or disable.
Test: as follows
- built
- flashed
- booted
- Manually verified that mask/mark is set correctly
Bug: 28806131
(cherry picked from commit d18b92cd95
2017-07-06 19:10:33 +09:00
Hugo Benichi
064fd68f16
Merge "ConnectivityManager: allow usage of TYPE_NONE" am: ffcaee218d am: fab5b13b83 am: 0278aa4b70
...
am: fe42a55877
2017-07-05 14:54:05 +00:00
Hugo Benichi
fe42a55877
Merge "ConnectivityManager: allow usage of TYPE_NONE" am: ffcaee218d am: fab5b13b83
...
am: 0278aa4b70
Change-Id: I1707e39308b0cf425b75e1e3f85323743c252c2f
2017-07-05 14:47:56 +00:00
Hugo Benichi
600aae4fe7
Merge "ConnectivityServiceTest: more informative assert failures" am: 9951460998 am: 598e36fd6a am: 14f400ca81
...
am: 3ca4158752
2017-07-05 14:40:30 +00:00
Hugo Benichi
fab5b13b83
Merge "ConnectivityManager: allow usage of TYPE_NONE"
...
am: ffcaee218d
2017-07-05 14:33:35 +00:00
Hugo Benichi
3ca4158752
Merge "ConnectivityServiceTest: more informative assert failures" am: 9951460998 am: 598e36fd6a
...
am: 14f400ca81
Change-Id: If00f0fd750d54074c0c642465384446502c1deec
2017-07-05 14:33:34 +00:00
Treehugger Robot
ffcaee218d
Merge "ConnectivityManager: allow usage of TYPE_NONE"
2017-07-05 14:21:35 +00:00
Hugo Benichi
598e36fd6a
Merge "ConnectivityServiceTest: more informative assert failures"
...
am: 9951460998
2017-07-05 14:19:33 +00:00
Treehugger Robot
9951460998
Merge "ConnectivityServiceTest: more informative assert failures"
2017-07-05 14:07:37 +00:00
Hugo Benichi
6fe0f587c5
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 5b906a4ece am: 6c65982d2b am: 80bc56bf2a
...
am: f6362d50a6
2017-07-05 12:56:08 +00:00
Hugo Benichi
f6362d50a6
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 5b906a4ece am: 6c65982d2b
...
am: 80bc56bf2a
Change-Id: I5e33e909cd8887460c2641c069432ec6bfa5beda
2017-07-05 12:49:04 +00:00
Hugo Benichi
6c65982d2b
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
...
am: 5b906a4ece
2017-07-05 12:35:01 +00:00
Hugo Benichi
37d5c3cb21
ConnectivityManager: allow usage of TYPE_NONE
...
This patch allows to use TYPE_NONE for the legacy network type variable
of NetworkInfo. This usage is "safe" with respect to legacy APIs using
network types as most of them already returns null or do nothing for
TYPE_NONE.
Of the existing APIs in ConnectivityManager that accept a network type
argument, those which were already returning null or doing nothing for
TYPE_NONE are:
getNetworkInfo(int)
getNetworkForType(int)
stopUsingNetworkFeature(int, String)
networkCapabilitiesForType(int)
requestRouteToHostAddress(int, InetAddress)
reportInetCondition(int, int)
isNetworkSupported(int)
getLinkProperties(int)
Only setProvisioningNotificationVisible needs an additional guard
against TYPE_NONE.
Bug: 30088447
Bug: 62844794
Test: runtest frameworks-net
Change-Id: I112596fcd03d3c2cd42a2a84d265adb38e3944bb
2017-07-05 21:30:52 +09:00
Hugo Benichi
6b1d01e117
ConnectivityServiceTest: more informative assert failures
...
Bug: 62918393
Test: runtest frameworks-net
Change-Id: If87315ef7cba6380596f48b92c7e0f6eeccc8368
2017-07-05 21:30:10 +09:00
Hugo Benichi
5b906a4ece
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
2017-07-05 12:25:16 +00:00
Hugo Benichi
d148700cd0
ConnectivityServiceTest: eliminate remaining sleep()
...
ConnectivityServiceTest was still using sleep() in a few places although
these were unnecessary:
- in testSatisfiedThenLostNetworkRequestDoesNotTriggerOnAvailable(),
expectNoCallback() and expectAvailableCallback() already include
waitForIdleHandler calls that drain the message queues and make
sleep no-ops.
- in testTimedoutAfterUnregisterdNetworkRequest, the sleeps were
introduced before unregisterNetworkCallback was changed to have a
synchronous effect for callback unregistration, therefore the sleep
becomes simply non-sensical. To reflect this the name of the method
is also changed.
Bug: 62918393
Test: runtest frameworks-net
Change-Id: I7b701ecf5846a5e1890e86107b8d2544b419ce44
2017-07-05 16:07:57 +09:00
Roland Levillain
fdf31f0988
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 613b73cac8 am: 0d0c37da2a am: bdcebe39e6
...
am: 1305ff8ac6
2017-07-04 11:53:16 +00:00
Roland Levillain
9edf336004
Merge "Revert "ConnectivityServiceTest: more informative assert failures"" am: a03e68e3e9 am: 2654f7c646 am: 3b2b9b6238
...
am: b952da3812
2017-07-04 11:49:12 +00:00
Roland Levillain
1597bcf0be
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am: 374ad24705 am: 08443dc3d6 am: a3909e0583
...
am: 2475bfde83
2017-07-04 11:47:35 +00:00
Roland Levillain
1305ff8ac6
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 613b73cac8 am: 0d0c37da2a
...
am: bdcebe39e6
Change-Id: I428cb473221a403e3c78cbc5d1224d46747ec315
2017-07-04 11:46:56 +00:00
Roland Levillain
b952da3812
Merge "Revert "ConnectivityServiceTest: more informative assert failures"" am: a03e68e3e9 am: 2654f7c646
...
am: 3b2b9b6238
Change-Id: Id038c0f03a0edaff27b51878a6e2ee7aace7e7cb
2017-07-04 11:43:07 +00:00
Roland Levillain
2475bfde83
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am: 374ad24705 am: 08443dc3d6
...
am: a3909e0583
Change-Id: I8ecc2290d58b9e8f570ec404bbde1a2a60a89b75
2017-07-04 11:41:37 +00:00
Roland Levillain
0d0c37da2a
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""
...
am: 613b73cac8
2017-07-04 11:31:30 +00:00
Roland Levillain
2654f7c646
Merge "Revert "ConnectivityServiceTest: more informative assert failures""
...
am: a03e68e3e9
2017-07-04 11:24:25 +00:00
Roland Levillain
08443dc3d6
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()""
...
am: 374ad24705
2017-07-04 11:22:32 +00:00
Roland Levillain
613b73cac8
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""
2017-07-04 11:15:18 +00:00
Roland Levillain
5a58f9da60
Revert "ConnectivityManager: allow usage of TYPE_NONE"
...
This CL is breaking some internal builds.
This reverts commit 0bc85784a8
2017-07-04 11:14:03 +00:00
Roland Levillain
a03e68e3e9
Merge "Revert "ConnectivityServiceTest: more informative assert failures""
2017-07-04 11:12:10 +00:00
Roland Levillain
d91096e549
Revert "ConnectivityServiceTest: more informative assert failures"
...
CL https://android-review.googlesource.com/#/c/420720/ is
breaking several internal builds, and CL
https://android-review.googlesource.com/#/c/422480/ must
be reverted beforehand.
This reverts commit bde57bd251
2017-07-04 11:11:35 +00:00
Roland Levillain
374ad24705
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()""
2017-07-04 11:11:09 +00:00
Roland Levillain
455db172a9
Revert "ConnectivityServiceTest: eliminate remaining sleep()"
...
CL https://android-review.googlesource.com/#/c/420720/ is
breaking several internal builds, and CL
https://android-review.googlesource.com/#/c/422481/ must
be reverted beforehand.
This reverts commit 638073b483
2017-07-04 11:10:06 +00:00
Hugo Benichi
f521523042
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: bd5e242d96 am: 556a005a30 am: 2a7985a6d0
...
am: a2838c9062
2017-07-04 10:01:25 +00:00
