Hugo Benichi
508bdba401
Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master am: 6ab950dd5f am: 6659fdba55 -s ours
...
am: 7f28a4bb9a -s ours
Change-Id: Ibe84e68d5224833b92e64e917123d835b7cca46f
2017-07-11 10:34:14 +00:00
Hugo Benichi
7f28a4bb9a
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
f1132ede8c
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 103292d0b7 )
2017-07-11 15:52:37 +09:00
Android Build Merger (Role)
176af3ed67
Merge "Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6" into oc-dr1-dev-plus-aosp am: b66be1a4db"
2017-07-06 16:30:15 +00:00
Android Build Merger (Role)
b45429ba13
Merge "Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6" into oc-dr1-dev-plus-aosp am: b66be1a4db"
2017-07-06 16:29:52 +00:00
Lorenzo Colitti
d272930f7d
Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6" into oc-dr1-dev-plus-aosp
...
am: b66be1a4db
Change-Id: Ic69cc209c2afbb99580998bb77f3b7df80afe8be
2017-07-06 16:29:04 +00:00
Lorenzo Colitti
74b9271702
Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6" into oc-dr1-dev-plus-aosp
...
am: b66be1a4db
Change-Id: Iaafa4739f5e116fd94c60d662f9c9d09d56fe06e
2017-07-06 16:28:32 +00:00
Android Build Merger (Role)
c9e2235446
Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6 am: 97eec7adbb"
2017-07-06 16:27:32 +00:00
Lorenzo Colitti
83e5900498
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6
...
am: 97eec7adbb
Change-Id: I083aac710590a461f2c12735e0daaf35a6f35387
2017-07-06 16:25:48 +00:00
Lorenzo Colitti
522149f33d
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am: d2eef601f6
...
am: 97eec7adbb
Change-Id: I0c25ea79b2f62fa548c4ed5cccb398530f138822
2017-07-06 16:25:24 +00:00
Android Build Merger (Role)
b66be1a4db
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
d14f673516
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
97eec7adbb
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
0e42c8a0ab
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 668370b9a5d36511f8f2cd58d6c6b0fc1020ee2d)
Change-Id: I95e75b11b973707bcb428ea6498fbfd8e717b855
2017-07-06 19:10:33 +09:00
Hugo Benichi
50b3fad094
Merge "ConnectivityManager: allow usage of TYPE_NONE" am: d54a27d898 am: 93e1941b43 am: 0278aa4b70
...
am: 3d2b4e04f3
Change-Id: I1e005686a1de5f2154fbc614ea52ce1a3ff5fc81
2017-07-05 14:54:05 +00:00
Hugo Benichi
3d2b4e04f3
Merge "ConnectivityManager: allow usage of TYPE_NONE" am: d54a27d898 am: 93e1941b43
...
am: 0278aa4b70
Change-Id: I1707e39308b0cf425b75e1e3f85323743c252c2f
2017-07-05 14:47:56 +00:00
Hugo Benichi
2a8b986cb7
Merge "ConnectivityServiceTest: more informative assert failures" am: cc1feacd8d am: a64e822036 am: 14f400ca81
...
am: 5c84e3b690
Change-Id: Icafd27e8273aa6b6595c30affd23a960e5d55c53
2017-07-05 14:40:30 +00:00
Hugo Benichi
93e1941b43
Merge "ConnectivityManager: allow usage of TYPE_NONE"
...
am: d54a27d898
Change-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962
2017-07-05 14:33:35 +00:00
Hugo Benichi
5c84e3b690
Merge "ConnectivityServiceTest: more informative assert failures" am: cc1feacd8d am: a64e822036
...
am: 14f400ca81
Change-Id: If00f0fd750d54074c0c642465384446502c1deec
2017-07-05 14:33:34 +00:00
Treehugger Robot
d54a27d898
Merge "ConnectivityManager: allow usage of TYPE_NONE"
2017-07-05 14:21:35 +00:00
Hugo Benichi
a64e822036
Merge "ConnectivityServiceTest: more informative assert failures"
...
am: cc1feacd8d
Change-Id: Iaa55014ae4c2f4927059735c349c40ada836b79b
2017-07-05 14:19:33 +00:00
Treehugger Robot
cc1feacd8d
Merge "ConnectivityServiceTest: more informative assert failures"
2017-07-05 14:07:37 +00:00
Hugo Benichi
b92c1346cd
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 2af7cbd8b7 am: c521380789 am: 80bc56bf2a
...
am: 9ca9374aff
Change-Id: I9b1c77bd8d0710736f1f29b204acc3a162e833fb
2017-07-05 12:56:08 +00:00
Hugo Benichi
9ca9374aff
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 2af7cbd8b7 am: c521380789
...
am: 80bc56bf2a
Change-Id: I5e33e909cd8887460c2641c069432ec6bfa5beda
2017-07-05 12:49:04 +00:00
Hugo Benichi
c521380789
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
...
am: 2af7cbd8b7
Change-Id: Ib1e31c2b8999d07b20ef4cef8e70d851f93df6e5
2017-07-05 12:35:01 +00:00
Hugo Benichi
ad353f451a
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
99495b1a4d
ConnectivityServiceTest: more informative assert failures
...
Bug: 62918393
Test: runtest frameworks-net
Change-Id: If87315ef7cba6380596f48b92c7e0f6eeccc8368
2017-07-05 21:30:10 +09:00
Hugo Benichi
2af7cbd8b7
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
2017-07-05 12:25:16 +00:00
Hugo Benichi
96d0a49b19
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
a383359f01
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: a4fcd1a2b7 am: 8ad104e62c am: bdcebe39e6
...
am: 93caca72db
Change-Id: Ibd1ef362cdc21d57aefb2d1180dc678bb2692f34
2017-07-04 11:53:16 +00:00
Roland Levillain
7639be3a14
Merge "Revert "ConnectivityServiceTest: more informative assert failures"" am: 959e3f9ac9 am: a17d7171d9 am: 3b2b9b6238
...
am: ee2e0723c7
Change-Id: I914c3ad6074e99e313c65572e3f38144a7f8a0d9
2017-07-04 11:49:12 +00:00
Roland Levillain
49a13768ba
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am: 1c5d788650 am: 2e99b8e7d2 am: a3909e0583
...
am: efe62d5f06
Change-Id: I3d7c4b4752143983bc67f72120883d45925129f7
2017-07-04 11:47:35 +00:00
Roland Levillain
93caca72db
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: a4fcd1a2b7 am: 8ad104e62c
...
am: bdcebe39e6
Change-Id: I428cb473221a403e3c78cbc5d1224d46747ec315
2017-07-04 11:46:56 +00:00
Roland Levillain
ee2e0723c7
Merge "Revert "ConnectivityServiceTest: more informative assert failures"" am: 959e3f9ac9 am: a17d7171d9
...
am: 3b2b9b6238
Change-Id: Id038c0f03a0edaff27b51878a6e2ee7aace7e7cb
2017-07-04 11:43:07 +00:00
Roland Levillain
efe62d5f06
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am: 1c5d788650 am: 2e99b8e7d2
...
am: a3909e0583
Change-Id: I8ecc2290d58b9e8f570ec404bbde1a2a60a89b75
2017-07-04 11:41:37 +00:00
Roland Levillain
8ad104e62c
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""
...
am: a4fcd1a2b7
Change-Id: I49221522c1a9a6e7d4ae72529c1a47b736e26a39
2017-07-04 11:31:30 +00:00
Roland Levillain
a17d7171d9
Merge "Revert "ConnectivityServiceTest: more informative assert failures""
...
am: 959e3f9ac9
Change-Id: Ie61051984a1b6efbb0b19754ce0fb99024ab296a
2017-07-04 11:24:25 +00:00
Roland Levillain
2e99b8e7d2
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()""
...
am: 1c5d788650
Change-Id: If210f213c7840c218d5e847667c7613d53f86661
2017-07-04 11:22:32 +00:00
Roland Levillain
a4fcd1a2b7
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""
2017-07-04 11:15:18 +00:00
Roland Levillain
4bb710cb01
Revert "ConnectivityManager: allow usage of TYPE_NONE"
...
This CL is breaking some internal builds.
This reverts commit 0b7642a820 .
Change-Id: Ie79214808d84c73f54a525f515b4c90a3fb23542
2017-07-04 11:14:03 +00:00
Roland Levillain
959e3f9ac9
Merge "Revert "ConnectivityServiceTest: more informative assert failures""
2017-07-04 11:12:10 +00:00
Roland Levillain
a12b67eacf
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 a0b7f12eb7 .
Change-Id: I5883409452d39e1834e183aa7b5ccdbf14291ca5
2017-07-04 11:11:35 +00:00
Roland Levillain
1c5d788650
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()""
2017-07-04 11:11:09 +00:00
Roland Levillain
d5810f566f
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 137a0e6d16 .
Change-Id: If0b196b6860c4087a05b28770469d7850a76fd37
2017-07-04 11:10:06 +00:00
Hugo Benichi
cc450b9d12
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: a1dca50b88 am: 745a3564e2 am: 2a7985a6d0
...
am: 7f4b6d54b2
Change-Id: I9449d73a1cba183d6203d2fa9165027a5482c56c
2017-07-04 10:01:25 +00:00
Hugo Benichi
7f4b6d54b2
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: a1dca50b88 am: 745a3564e2
...
am: 2a7985a6d0
Change-Id: I3d53ece1c18cf1cf1e5e361231e321dcd59b5bad
2017-07-04 09:55:04 +00:00
Hugo Benichi
5c8d2693bc
Merge changes I90c211dc,I4455f272 am: a5ea99e288 am: 8a73d29f31 am: d0e5f1d280
...
am: 7c6b8f0138
Change-Id: I8a07b60112df37a63804454b356b4838c3a24965
2017-07-04 09:54:57 +00:00
Hugo Benichi
7c6b8f0138
Merge changes I90c211dc,I4455f272 am: a5ea99e288 am: 8a73d29f31
...
am: d0e5f1d280
Change-Id: Ia79936c51ec8236d5c92c19a8d2a3dff34f0e1a1
2017-07-04 09:49:06 +00:00
Hugo Benichi
745a3564e2
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
...
am: a1dca50b88
Change-Id: I31a8f64b4ee37a58bc83c08251d949f44cc26fd4
2017-07-04 09:43:01 +00:00
Hugo Benichi
8a73d29f31
Merge changes I90c211dc,I4455f272
...
am: a5ea99e288
Change-Id: I502d978ff636a00979d2083c39381bf600d3d6da
2017-07-04 09:35:51 +00:00