joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity
4,287 commits 1 branch 0 tags 204 MiB
Commit graph

4,287 commits

This branch
This branch
All branches
Message SHA1
Merge "ConnectivityManager: allow usage of TYPE_NONE" am: d54a27d898 am: 93e1941b43 
am: 0278aa4b70

Change-Id: I1707e39308b0cf425b75e1e3f85323743c252c2f

Hugo Benichi   authored and   android-build-merger   commited 2017-07-05 14:47:56 +00:00
3d2b4e04f3
Merge "ConnectivityServiceTest: more informative assert failures" am: cc1feacd8d am: a64e822036 am: 14f400ca81 
am: 5c84e3b690

Change-Id: Icafd27e8273aa6b6595c30affd23a960e5d55c53

Hugo Benichi   authored and   android-build-merger   commited 2017-07-05 14:40:30 +00:00
2a8b986cb7
Merge "ConnectivityManager: allow usage of TYPE_NONE" 
am: d54a27d898

Change-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962

Hugo Benichi   authored and   android-build-merger   commited 2017-07-05 14:33:35 +00:00
93e1941b43
Merge "ConnectivityServiceTest: more informative assert failures" am: cc1feacd8d am: a64e822036 
am: 14f400ca81

Change-Id: If00f0fd750d54074c0c642465384446502c1deec

Hugo Benichi   authored and   android-build-merger   commited 2017-07-05 14:33:34 +00:00
5c84e3b690
Merge "ConnectivityManager: allow usage of TYPE_NONE"
Treehugger Robot   authored and   Gerrit Code Review   commited 2017-07-05 14:21:35 +00:00
d54a27d898
Merge "ConnectivityServiceTest: more informative assert failures" 
am: cc1feacd8d

Change-Id: Iaa55014ae4c2f4927059735c349c40ada836b79b

Hugo Benichi   authored and   android-build-merger   commited 2017-07-05 14:19:33 +00:00
a64e822036
Merge "ConnectivityServiceTest: more informative assert failures"
Treehugger Robot   authored and   Gerrit Code Review   commited 2017-07-05 14:07:37 +00:00
cc1feacd8d
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 2af7cbd8b7 am: c521380789 am: 80bc56bf2a 
am: 9ca9374aff

Change-Id: I9b1c77bd8d0710736f1f29b204acc3a162e833fb

Hugo Benichi   authored and   android-build-merger   commited 2017-07-05 12:56:08 +00:00
b92c1346cd
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 2af7cbd8b7 am: c521380789 
am: 80bc56bf2a

Change-Id: I5e33e909cd8887460c2641c069432ec6bfa5beda

Hugo Benichi   authored and   android-build-merger   commited 2017-07-05 12:49:04 +00:00
9ca9374aff
Merge "ConnectivityServiceTest: eliminate remaining sleep()" 
am: 2af7cbd8b7

Change-Id: Ib1e31c2b8999d07b20ef4cef8e70d851f93df6e5

Hugo Benichi   authored and   android-build-merger   commited 2017-07-05 12:35:01 +00:00
c521380789
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

Hugo Benichi   commited 2017-07-05 21:30:52 +09:00
ad353f451a
ConnectivityServiceTest: more informative assert failures 
Bug: 62918393
Test: runtest frameworks-net
Change-Id: If87315ef7cba6380596f48b92c7e0f6eeccc8368

Hugo Benichi   commited 2017-07-05 21:30:10 +09:00
99495b1a4d
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
Hugo Benichi   authored and   Gerrit Code Review   commited 2017-07-05 12:25:16 +00:00
2af7cbd8b7
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

Hugo Benichi   commited 2017-07-05 16:07:57 +09:00
96d0a49b19
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: a4fcd1a2b7 am: 8ad104e62c am: bdcebe39e6 
am: 93caca72db

Change-Id: Ibd1ef362cdc21d57aefb2d1180dc678bb2692f34

Roland Levillain   authored and   android-build-merger   commited 2017-07-04 11:53:16 +00:00
a383359f01
Merge "Revert "ConnectivityServiceTest: more informative assert failures"" am: 959e3f9ac9 am: a17d7171d9 am: 3b2b9b6238 
am: ee2e0723c7

Change-Id: I914c3ad6074e99e313c65572e3f38144a7f8a0d9

Roland Levillain   authored and   android-build-merger   commited 2017-07-04 11:49:12 +00:00
7639be3a14
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am: 1c5d788650 am: 2e99b8e7d2 am: a3909e0583 
am: efe62d5f06

Change-Id: I3d7c4b4752143983bc67f72120883d45925129f7

Roland Levillain   authored and   android-build-merger   commited 2017-07-04 11:47:35 +00:00
49a13768ba
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: a4fcd1a2b7 am: 8ad104e62c 
am: bdcebe39e6

Change-Id: I428cb473221a403e3c78cbc5d1224d46747ec315

Roland Levillain   authored and   android-build-merger   commited 2017-07-04 11:46:56 +00:00
93caca72db
Merge "Revert "ConnectivityServiceTest: more informative assert failures"" am: 959e3f9ac9 am: a17d7171d9 
am: 3b2b9b6238

Change-Id: Id038c0f03a0edaff27b51878a6e2ee7aace7e7cb

Roland Levillain   authored and   android-build-merger   commited 2017-07-04 11:43:07 +00:00
ee2e0723c7
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am: 1c5d788650 am: 2e99b8e7d2 
am: a3909e0583

Change-Id: I8ecc2290d58b9e8f570ec404bbde1a2a60a89b75

Roland Levillain   authored and   android-build-merger   commited 2017-07-04 11:41:37 +00:00
efe62d5f06
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" 
am: a4fcd1a2b7

Change-Id: I49221522c1a9a6e7d4ae72529c1a47b736e26a39

Roland Levillain   authored and   android-build-merger   commited 2017-07-04 11:31:30 +00:00
8ad104e62c
Merge "Revert "ConnectivityServiceTest: more informative assert failures"" 
am: 959e3f9ac9

Change-Id: Ie61051984a1b6efbb0b19754ce0fb99024ab296a

Roland Levillain   authored and   android-build-merger   commited 2017-07-04 11:24:25 +00:00
a17d7171d9
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" 
am: 1c5d788650

Change-Id: If210f213c7840c218d5e847667c7613d53f86661

Roland Levillain   authored and   android-build-merger   commited 2017-07-04 11:22:32 +00:00
2e99b8e7d2
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""
Roland Levillain   authored and   Gerrit Code Review   commited 2017-07-04 11:15:18 +00:00
a4fcd1a2b7
Revert "ConnectivityManager: allow usage of TYPE_NONE" 
This CL is breaking some internal builds.

This reverts commit 0b7642a820.

Change-Id: Ie79214808d84c73f54a525f515b4c90a3fb23542

Roland Levillain   commited 2017-07-04 11:14:03 +00:00
4bb710cb01
Merge "Revert "ConnectivityServiceTest: more informative assert failures""
Roland Levillain   authored and   Gerrit Code Review   commited 2017-07-04 11:12:10 +00:00
959e3f9ac9
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

Roland Levillain   commited 2017-07-04 11:11:35 +00:00
a12b67eacf
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()""
Roland Levillain   authored and   Gerrit Code Review   commited 2017-07-04 11:11:09 +00:00
1c5d788650
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

Roland Levillain   commited 2017-07-04 11:10:06 +00:00
d5810f566f
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: a1dca50b88 am: 745a3564e2 am: 2a7985a6d0 
am: 7f4b6d54b2

Change-Id: I9449d73a1cba183d6203d2fa9165027a5482c56c

Hugo Benichi   authored and   android-build-merger   commited 2017-07-04 10:01:25 +00:00
cc450b9d12
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: a1dca50b88 am: 745a3564e2 
am: 2a7985a6d0

Change-Id: I3d53ece1c18cf1cf1e5e361231e321dcd59b5bad

Hugo Benichi   authored and   android-build-merger   commited 2017-07-04 09:55:04 +00:00
7f4b6d54b2
Merge changes I90c211dc,I4455f272 am: a5ea99e288 am: 8a73d29f31 am: d0e5f1d280 
am: 7c6b8f0138

Change-Id: I8a07b60112df37a63804454b356b4838c3a24965

Hugo Benichi   authored and   android-build-merger   commited 2017-07-04 09:54:57 +00:00
5c8d2693bc
Merge changes I90c211dc,I4455f272 am: a5ea99e288 am: 8a73d29f31 
am: d0e5f1d280

Change-Id: Ia79936c51ec8236d5c92c19a8d2a3dff34f0e1a1

Hugo Benichi   authored and   android-build-merger   commited 2017-07-04 09:49:06 +00:00
7c6b8f0138
Merge "ConnectivityServiceTest: eliminate remaining sleep()" 
am: a1dca50b88

Change-Id: I31a8f64b4ee37a58bc83c08251d949f44cc26fd4

Hugo Benichi   authored and   android-build-merger   commited 2017-07-04 09:43:01 +00:00
745a3564e2
Merge changes I90c211dc,I4455f272 
am: a5ea99e288

Change-Id: I502d978ff636a00979d2083c39381bf600d3d6da

Hugo Benichi   authored and   android-build-merger   commited 2017-07-04 09:35:51 +00:00
8a73d29f31
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
Treehugger Robot   authored and   Gerrit Code Review   commited 2017-07-04 09:25:53 +00:00
a1dca50b88
Merge changes I90c211dc,I4455f272 
* changes:
  ConnectivityServiceTest: more informative assert failures
  ConnectivityManager: allow usage of TYPE_NONE

Treehugger Robot   authored and   Gerrit Code Review   commited 2017-07-04 09:22:07 +00:00
a5ea99e288
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: I78426665670f702304212753f417b3d5a8a2c107

Hugo Benichi   commited 2017-07-04 16:23:06 +09:00
137a0e6d16
ConnectivityServiceTest: more informative assert failures 
Bug: 62918393
Test: runtest frameworks-net
Change-Id: I90c211dc6d6262475924ecabc2863c47aec5a0b9

Hugo Benichi   commited 2017-07-04 16:23:05 +09:00
a0b7f12eb7
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: I4455f2726d06406047086368628c1f253d854d8d

Hugo Benichi   commited 2017-07-04 16:22:59 +09:00
0b7642a820
Merge "Wakeup packet mark/mask configuration option" am: 728e787ba1 am: 06cc72b5ec am: 48360082bc 
am: b5e29bf906

Change-Id: I96595368cfb6f461a84dae5bc1330f6c843f77ba

Joel Scherpelz   authored and   android-build-merger   commited 2017-07-04 04:16:43 +00:00
1da2fae841
Merge "Wakeup packet mark/mask configuration option" am: 728e787ba1 am: 06cc72b5ec 
am: 48360082bc

Change-Id: Ie5c88f5b91248a5f069decc0708f17af4b649710

Joel Scherpelz   authored and   android-build-merger   commited 2017-07-04 04:07:56 +00:00
b5e29bf906
Merge "Wakeup packet mark/mask configuration option" 
am: 728e787ba1

Change-Id: Ief60fa8a594931c8968db7a9ea2872c030794088

Joel Scherpelz   authored and   android-build-merger   commited 2017-07-04 03:47:14 +00:00
06cc72b5ec
Merge "Wakeup packet mark/mask configuration option"
Treehugger Robot   authored and   Gerrit Code Review   commited 2017-07-04 03:38:34 +00:00
728e787ba1
Merge "Networking unit tests: fix some flaky tests" am: 501bae6492 am: ae3dac0601 am: 741fdea598 
am: d7310564b8

Change-Id: I6673a65a09214911063824d9beffe40b6376c380

Hugo Benichi   authored and   android-build-merger   commited 2017-07-03 10:00:41 +00:00
c3e211bc76
Merge "Networking unit tests: fix some flaky tests" am: 501bae6492 am: ae3dac0601 
am: 741fdea598

Change-Id: Ie5d8f2e01d14c4dc4fc83d1645130258ba92998d

Hugo Benichi   authored and   android-build-merger   commited 2017-07-03 09:51:26 +00:00
d7310564b8
Merge "Networking unit tests: fix some flaky tests" 
am: 501bae6492

Change-Id: I6815e732f334d11208ff12af4023912593d96499

Hugo Benichi   authored and   android-build-merger   commited 2017-07-03 09:35:06 +00:00
ae3dac0601
Networking unit tests: fix some flaky tests 
- less strict regex for SharedLogTest: the subsecond part of the
   timestamp can have 0, 1, 2 or 3 digits.
 - refactor NetworkStatsServiceTest and NetworkStatsObserversTest to use
   waitForIdleHandler facility of ConnectivityServiceTest.
   NetworkStatsServiceTest was using a flaky custom version of
   waitForIdleHandler.

Bug: 62918393
Bug: 32561414
Test: runtest frameworks-net
Change-Id: I634acfb5f4fe1bd5267e3f14b9f645edc32d5d12

Hugo Benichi   commited 2017-07-03 16:29:01 +09:00
44ceaa602e
Merge "[BUG] java.util.MissingFormatArgumentException: Format specifier '%d'" am: 755c6ea768 am: 81173713d7 am: a900930d58 
am: d5aa5a6063

Change-Id: I4b4973570b8a8f1757986b1aa8ee1a6c3496d976

liangweikang@xiaomi.com   authored and   android-build-merger   commited 2017-07-03 00:45:49 +00:00
23dd228784
Merge "[BUG] java.util.MissingFormatArgumentException: Format specifier '%d'" am: 755c6ea768 am: 81173713d7 
am: a900930d58

Change-Id: I180c73a8dc41ea907c1e7fd76624fce0a4b523d3

liangweikang@xiaomi.com   authored and   android-build-merger   commited 2017-07-03 00:40:18 +00:00
d5aa5a6063