OSDN Git Service
Android Build Merger (Role) [Thu, 6 Jul 2017 00:53:19 +0000 (00:53 +0000)]
Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94" into stage-aosp-master am:
6340d93571" into oc-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 00:51:40 +0000 (00:51 +0000)]
Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94" into stage-aosp-master
am:
6340d93571
Change-Id: Ic206b34a0535c3a8c92e45c3107d4f16985a5cb8
Android Build Merger (Role) [Thu, 6 Jul 2017 00:50:59 +0000 (00:50 +0000)]
Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94 am:
5ba953cbe9" into oc-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 00:49:52 +0000 (00:49 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94
am:
5ba953cbe9
Change-Id: Iec17e43ba2df36ef45a55f7055886df7505296af
Erik Kline [Thu, 6 Jul 2017 00:48:24 +0000 (00:48 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94
am:
5ba953cbe9
Change-Id: I87dbd0a8840e57c7959a935e17654a3a4e1b3edf
Android Build Merger (Role) [Thu, 6 Jul 2017 00:43:51 +0000 (00:43 +0000)]
Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94" into stage-aosp-master
Erik Kline [Thu, 6 Jul 2017 00:42:14 +0000 (00:42 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface"
am:
36904fbc94
Change-Id: I7789242c6f574c1d81eb0a5e9527b167d4b3c755
Erik Kline [Thu, 6 Jul 2017 00:41:33 +0000 (00:41 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface"
am:
36904fbc94
Change-Id: Iea47f74dc77b347343726d2ab0ee128e5391767b
Treehugger Robot [Thu, 6 Jul 2017 00:31:44 +0000 (00:31 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface"
Android Build Merger (Role) [Wed, 5 Jul 2017 22:59:10 +0000 (22:59 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 22:56:14 +0000 (22:56 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
am:
4e4b5a2426
Change-Id: I6d68ea194068c674d5e79a01d9ce05b9674dc16b
Android Build Merger (Role) [Wed, 5 Jul 2017 22:56:05 +0000 (22:56 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp
Android Build Merger (Role) [Wed, 5 Jul 2017 22:55:11 +0000 (22:55 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 22:53:14 +0000 (22:53 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
am:
4e4b5a2426
Change-Id: I7f960d0d7e41ed89e422560318a73dad92562c87
Android Build Merger (Role) [Wed, 5 Jul 2017 22:52:17 +0000 (22:52 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 22:52:14 +0000 (22:52 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
am:
93cc3d86ad
Change-Id: I393799a36639f94583726be4176ef8d436aee932
Android Build Merger (Role) [Wed, 5 Jul 2017 22:51:47 +0000 (22:51 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 22:50:21 +0000 (22:50 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
am:
93cc3d86ad
Change-Id: I724ab35811887b1fd4ab2222046ed1123fc4b4cc
Andreas Gampe [Wed, 5 Jul 2017 22:49:24 +0000 (22:49 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master
am:
42d194ee03
Change-Id: I1836f523463d004ed7c6f9f907c5c11d3fb086e2
Andreas Gampe [Wed, 5 Jul 2017 22:48:16 +0000 (22:48 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master
am:
42d194ee03
Change-Id: I694c150dc2d944d2adf0f2972e82b3c227843438
Android Build Merger (Role) [Wed, 5 Jul 2017 22:44:48 +0000 (22:44 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56 am:
f70270f94a" into oc-dev-plus-aosp
Android Build Merger (Role) [Wed, 5 Jul 2017 22:43:56 +0000 (22:43 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
Andreas Gampe [Wed, 5 Jul 2017 22:42:57 +0000 (22:42 +0000)]
Merge "Framework: Add libziparchive dependency" am:
2688a9ab56
am:
f70270f94a
Change-Id: Ic8cf6139665107692a7b74a15f51a3387a4fa3e7
Andreas Gampe [Wed, 5 Jul 2017 22:42:39 +0000 (22:42 +0000)]
Merge "Framework: Add libziparchive dependency" am:
2688a9ab56
am:
f70270f94a
Change-Id: I08559a9603872b2b671bb9ef3ccc54955865b18b
Android Build Merger (Role) [Wed, 5 Jul 2017 22:38:28 +0000 (22:38 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
Tobias Thierer [Wed, 5 Jul 2017 22:37:47 +0000 (22:37 +0000)]
Merge "Track update of org.json API"
am:
c5a65bc152
Change-Id: I9f6df94ef58488a62558ee31e549c5e71a726f8a
Tobias Thierer [Wed, 5 Jul 2017 22:33:10 +0000 (22:33 +0000)]
Merge "Track update of org.json API"
am:
c5a65bc152
Change-Id: I755b8be63f4a9dbe11d1c14c0d9f3f8cd3e93916
Android Build Merger (Role) [Wed, 5 Jul 2017 22:33:09 +0000 (22:33 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master
Andreas Gampe [Wed, 5 Jul 2017 22:30:56 +0000 (22:30 +0000)]
Merge "Framework: Add libziparchive dependency"
am:
2688a9ab56
Change-Id: I68c353e8784c86b4a1e1e38c3c2f65e79bd7920a
Andreas Gampe [Wed, 5 Jul 2017 22:30:51 +0000 (22:30 +0000)]
Merge "Framework: Add libziparchive dependency"
am:
2688a9ab56
Change-Id: I4d42a5c0564f7d142b1ee3fe8606b4bd6371e9a9
Tobias Thierer [Wed, 5 Jul 2017 22:22:16 +0000 (22:22 +0000)]
Merge "Track update of org.json API"
Treehugger Robot [Wed, 5 Jul 2017 22:20:40 +0000 (22:20 +0000)]
Merge "Framework: Add libziparchive dependency"
Android Build Merger (Role) [Wed, 5 Jul 2017 21:20:02 +0000 (21:20 +0000)]
Merge "Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master am:
a998cffb1b -s ours" into oc-dev-plus-aosp
Adam Lesinski [Wed, 5 Jul 2017 21:19:08 +0000 (21:19 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master
am:
a998cffb1b -s ours
Change-Id: I15f2cf810bd0f2feb3117dbebe7f15daff281c1f
Android Build Merger (Role) [Wed, 5 Jul 2017 21:18:47 +0000 (21:18 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours" into oc-dev-plus-aosp
Adam Lesinski [Wed, 5 Jul 2017 21:17:50 +0000 (21:17 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours
am:
1ebe18d691 -s ours
Change-Id: Idb9123f2913be7ac629c7822a846b6de849c638c
Adam Lesinski [Wed, 5 Jul 2017 21:16:55 +0000 (21:16 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours
am:
1ebe18d691 -s ours
Change-Id: I407815d637dadf8416c8df715b533e2eb3edee2e
Android Build Merger (Role) [Wed, 5 Jul 2017 21:13:19 +0000 (21:13 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master
Adam Lesinski [Wed, 5 Jul 2017 21:12:22 +0000 (21:12 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6"
am:
6fd0671265 -s ours
Change-Id: Icefbb67a8046a4bc57de5f69bcc32ab235371ddc
Adam Lesinski [Wed, 5 Jul 2017 21:11:36 +0000 (21:11 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6"
am:
6fd0671265 -s ours
Change-Id: Ib9428106e209a77220e22f43210ecf0d946128ad
Treehugger Robot [Wed, 5 Jul 2017 21:01:29 +0000 (21:01 +0000)]
Andreas Gampe [Mon, 3 Jul 2017 20:03:29 +0000 (13:03 -0700)]
Framework: Add libziparchive dependency
Bug:
37342627
Test: m
Change-Id: I4bc85b87a6c4305f14586aba662bcccbd4b8b6e2
Adam Lesinski [Fri, 28 Oct 2016 23:39:15 +0000 (16:39 -0700)]
Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6
Partial cherry-pick of commit
7ad1110ecd6a840fcd2895c62668828a1ca029c6.
Test: m
Merged-In: Id0e57ee828f17008891fe3741935a9be8830b01d
Change-Id: Id0e57ee828f17008891fe3741935a9be8830b01d
Erik Kline [Tue, 4 Jul 2017 04:39:48 +0000 (13:39 +0900)]
Better logging infrastructure in OffloadHardwareInterface
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- watch "adb shell dumpsys connectivity tethering | tail -60" shows logs
Bug:
29337859
Bug:
32163131
Merged-In: I3b178f4bb798d9ac59b366723d19e3189d39942e
Merged-In: I1b64e562c74797cbfaa26f3a1b5e38c3bf2a0c0d
Merged-In: Id0bd14e5b364c497403c2d88f7b1c31d712e6f87
Change-Id: I78f28a9e940cc7e050f2d79f877d27468d13599a
Hugo Benichi [Wed, 5 Jul 2017 14:40:34 +0000 (14:40 +0000)]
Merge "ConnectivityManager: allow usage of TYPE_NONE" am:
279f32ded5
am:
0537f16516
Change-Id: If6430976a3a894b9f883e03692e500eb013a5245
Hugo Benichi [Wed, 5 Jul 2017 14:33:35 +0000 (14:33 +0000)]
Merge "ConnectivityManager: allow usage of TYPE_NONE"
am:
279f32ded5
Change-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962
Hugo Benichi [Wed, 5 Jul 2017 14:26:23 +0000 (14:26 +0000)]
Merge "ConnectivityServiceTest: more informative assert failures" am:
04d8a730a9
am:
0a7f5cc9d6
Change-Id: If152d2eb134f678673b76b181146874bf65fc536
Treehugger Robot [Wed, 5 Jul 2017 14:21:35 +0000 (14:21 +0000)]
Merge "ConnectivityManager: allow usage of TYPE_NONE"
Hugo Benichi [Wed, 5 Jul 2017 14:19:33 +0000 (14:19 +0000)]
Merge "ConnectivityServiceTest: more informative assert failures"
am:
04d8a730a9
Change-Id: Iaa55014ae4c2f4927059735c349c40ada836b79b
Treehugger Robot [Wed, 5 Jul 2017 14:07:37 +0000 (14:07 +0000)]
Merge "ConnectivityServiceTest: more informative assert failures"
Hugo Benichi [Wed, 5 Jul 2017 12:41:53 +0000 (12:41 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am:
66788dc4d8
am:
2d452e6c48
Change-Id: I6426659d9cf84f7e1d142b006ffe69df304f7a91
Hugo Benichi [Wed, 5 Jul 2017 12:35:01 +0000 (12:35 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
am:
66788dc4d8
Change-Id: Ib1e31c2b8999d07b20ef4cef8e70d851f93df6e5
Hugo Benichi [Tue, 20 Jun 2017 05:07:59 +0000 (14:07 +0900)]
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 [Mon, 26 Jun 2017 01:06:49 +0000 (10:06 +0900)]
ConnectivityServiceTest: more informative assert failures
Bug:
62918393
Test: runtest frameworks-net
Change-Id: If87315ef7cba6380596f48b92c7e0f6eeccc8368
Hugo Benichi [Wed, 5 Jul 2017 12:25:16 +0000 (12:25 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
Erik Kline [Wed, 5 Jul 2017 10:55:45 +0000 (19:55 +0900)]
DO NOT MERGE ANYWHERE
This reverts a duplicate test method resulting from a bad merge.
Test: as follows
- built
Change-Id: I8ca7c97a28fbf7d20753bb4d1f942e5c04a4edf8
Erik Kline [Wed, 5 Jul 2017 09:17:46 +0000 (09:17 +0000)]
resolve merge conflicts of
b1eb85c9a8d3 to stage-aosp-master
am:
dbc7279e85
Change-Id: I0280190a1d2d48ca2e80e823ed43112161af8271
Erik Kline [Wed, 5 Jul 2017 06:44:42 +0000 (15:44 +0900)]
resolve merge conflicts of
b1eb85c9a8d3 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I3ae731c21f292a476a9e30e229d66ef6ab4a0545
Merged-In: I717fdd269b012f32548ebe0603999ae403b03100
Merged-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
Merged-In: Ie32f50ec1a07e3126a05abee27c76bc63cdaca14
Change-Id: I217d7ca2958f3d6ca8992f738a034693a0fac486
Hugo Benichi [Mon, 26 Jun 2017 01:20:00 +0000 (10:20 +0900)]
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
Treehugger Robot [Wed, 5 Jul 2017 05:56:29 +0000 (05:56 +0000)]
Merge "Switch to USB_CONFIGURED as the primary USB readiness signal"
Erik Kline [Tue, 4 Jul 2017 13:02:49 +0000 (22:02 +0900)]
Switch to USB_CONFIGURED as the primary USB readiness signal
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- USB tethering on and off works as expected
Bug:
32163131
Bug:
36216864
Bug:
62147658
Bug:
62552150
Merged-In: I3ae731c21f292a476a9e30e229d66ef6ab4a0545
Merged-In: I717fdd269b012f32548ebe0603999ae403b03100
Merged-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
Change-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
(cherry picked from commit
c438e306cc69b9d4d62512030267e93011b29978)
Erik Kline [Tue, 4 Jul 2017 13:02:49 +0000 (22:02 +0900)]
Switch to USB_CONFIGURED as the primary USB readiness signal
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- USB tethering on and off works as expected
Bug:
32163131
Bug:
36216864
Bug:
62147658
Bug:
62552150
Merged-In: I3ae731c21f292a476a9e30e229d66ef6ab4a0545
Merged-In: I717fdd269b012f32548ebe0603999ae403b03100
Change-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
(cherry picked from commit
c438e306cc69b9d4d62512030267e93011b29978)
Roland Levillain [Tue, 4 Jul 2017 11:37:27 +0000 (11:37 +0000)]
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am:
10c314e19a
am:
d3f26b6731
Change-Id: I9d7be7013b1d70c5f3b1fef0399236c105f4196f
Roland Levillain [Tue, 4 Jul 2017 11:32:58 +0000 (11:32 +0000)]
Merge "Revert "ConnectivityServiceTest: more informative assert failures"" am:
d10790c902
am:
8f68232271
Change-Id: I575095f54431145106c626437d7187f50e445510
Roland Levillain [Tue, 4 Jul 2017 11:31:30 +0000 (11:31 +0000)]
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""
am:
10c314e19a
Change-Id: I49221522c1a9a6e7d4ae72529c1a47b736e26a39
Roland Levillain [Tue, 4 Jul 2017 11:31:23 +0000 (11:31 +0000)]
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am:
1e3624527b
am:
962f1842ca
Change-Id: I3e1c31d878b8f2899a3ff8b88ab565eb7856d477
Roland Levillain [Tue, 4 Jul 2017 11:24:25 +0000 (11:24 +0000)]
Merge "Revert "ConnectivityServiceTest: more informative assert failures""
am:
d10790c902
Change-Id: Ie61051984a1b6efbb0b19754ce0fb99024ab296a
Roland Levillain [Tue, 4 Jul 2017 11:22:32 +0000 (11:22 +0000)]
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()""
am:
1e3624527b
Change-Id: If210f213c7840c218d5e847667c7613d53f86661
Roland Levillain [Tue, 4 Jul 2017 11:15:18 +0000 (11:15 +0000)]
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""
Roland Levillain [Tue, 4 Jul 2017 11:07:47 +0000 (11:07 +0000)]
Revert "ConnectivityManager: allow usage of TYPE_NONE"
This CL is breaking some internal builds.
This reverts commit
726931ebf4707795413578b57a1f033bf9a6e064.
Change-Id: Ie79214808d84c73f54a525f515b4c90a3fb23542
Roland Levillain [Tue, 4 Jul 2017 11:12:10 +0000 (11:12 +0000)]
Merge "Revert "ConnectivityServiceTest: more informative assert failures""
Roland Levillain [Tue, 4 Jul 2017 11:09:10 +0000 (11:09 +0000)]
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
a6981669c4e2707bcfb3db001e262b2da4bb9c17.
Change-Id: I5883409452d39e1834e183aa7b5ccdbf14291ca5
Roland Levillain [Tue, 4 Jul 2017 11:11:09 +0000 (11:11 +0000)]
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()""
Roland Levillain [Tue, 4 Jul 2017 11:10:06 +0000 (11:10 +0000)]
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
8afb9cfd000dadc730e52ebdeb4ad031b84b8e03.
Change-Id: If0b196b6860c4087a05b28770469d7850a76fd37
Hugo Benichi [Tue, 4 Jul 2017 09:49:00 +0000 (09:49 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am:
4148fe64b9
am:
1005e82639
Change-Id: I0043c4a4c96f7ee39b9036060897dbf85222c6e6
Hugo Benichi [Tue, 4 Jul 2017 09:43:01 +0000 (09:43 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
am:
4148fe64b9
Change-Id: I31a8f64b4ee37a58bc83c08251d949f44cc26fd4
Hugo Benichi [Tue, 4 Jul 2017 09:42:51 +0000 (09:42 +0000)]
Merge changes I90c211dc,I4455f272 am:
a0ff4efc8b
am:
2c856480a0
Change-Id: Ifc74828ff2932b3c1043ed27bc2f9a5fda32e3ee
Hugo Benichi [Tue, 4 Jul 2017 09:35:51 +0000 (09:35 +0000)]
Merge changes I90c211dc,I4455f272
am:
a0ff4efc8b
Change-Id: I502d978ff636a00979d2083c39381bf600d3d6da
Treehugger Robot [Tue, 4 Jul 2017 09:25:53 +0000 (09:25 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
Treehugger Robot [Tue, 4 Jul 2017 09:22:07 +0000 (09:22 +0000)]
Merge changes I90c211dc,I4455f272
* changes:
ConnectivityServiceTest: more informative assert failures
ConnectivityManager: allow usage of TYPE_NONE
Hugo Benichi [Mon, 26 Jun 2017 01:20:00 +0000 (10:20 +0900)]
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 [Mon, 26 Jun 2017 01:06:49 +0000 (10:06 +0900)]
ConnectivityServiceTest: more informative assert failures
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I90c211dc6d6262475924ecabc2863c47aec5a0b9
Hugo Benichi [Tue, 20 Jun 2017 05:07:59 +0000 (14:07 +0900)]
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
Joel Scherpelz [Tue, 4 Jul 2017 03:55:15 +0000 (03:55 +0000)]
Merge "Wakeup packet mark/mask configuration option" am:
b975c88178
am:
01860f8ea5
Change-Id: I4e682aa58b0d889c9ede17b2b695cb9ec07b4b80
Joel Scherpelz [Tue, 4 Jul 2017 03:47:14 +0000 (03:47 +0000)]
Merge "Wakeup packet mark/mask configuration option"
am:
b975c88178
Change-Id: Ief60fa8a594931c8968db7a9ea2872c030794088
Treehugger Robot [Tue, 4 Jul 2017 03:38:34 +0000 (03:38 +0000)]
Merge "Wakeup packet mark/mask configuration option"
Neil Fuller [Mon, 3 Jul 2017 09:47:03 +0000 (09:47 +0000)]
Merge "Add dumpsys support to RulesManagerService" am:
348a1d635d
am:
06c2f8e346
Change-Id: I23f60a0c235780afd551cbe5f546918317bfe098
Neil Fuller [Mon, 3 Jul 2017 09:41:47 +0000 (09:41 +0000)]
Merge "Add dumpsys support to RulesManagerService"
am:
348a1d635d
Change-Id: Ib1b44ce174b625f2223dff72081ccfc7b2a9b390
Hugo Benichi [Mon, 3 Jul 2017 09:41:34 +0000 (09:41 +0000)]
Merge "Networking unit tests: fix some flaky tests" am:
501bae6492
am:
b87cf12ad3
Change-Id: Id95a8ef670b8f84664c518d19df449720ae90eb2
Hugo Benichi [Mon, 3 Jul 2017 09:35:06 +0000 (09:35 +0000)]
Merge "Networking unit tests: fix some flaky tests"
am:
501bae6492
Change-Id: I6815e732f334d11208ff12af4023912593d96499
Neil Fuller [Mon, 3 Jul 2017 09:29:32 +0000 (09:29 +0000)]
Merge "Add dumpsys support to RulesManagerService"
Treehugger Robot [Mon, 3 Jul 2017 09:23:26 +0000 (09:23 +0000)]
Merge "Networking unit tests: fix some flaky tests"
Erik Kline [Mon, 3 Jul 2017 08:47:36 +0000 (08:47 +0000)]
Merge "Pass all offload-exempt prefixes into OffloadController" am:
7fc4f63f23
am:
96ef858957
Change-Id: Ifd3817bd4569682d77a70f8192432391a573f6d8
Erik Kline [Mon, 3 Jul 2017 08:39:48 +0000 (08:39 +0000)]
Merge "Pass all offload-exempt prefixes into OffloadController"
am:
7fc4f63f23
Change-Id: Ibbca37f65dc0a0398432f325bf362996b9d61519
Treehugger Robot [Mon, 3 Jul 2017 08:30:30 +0000 (08:30 +0000)]
Merge "Pass all offload-exempt prefixes into OffloadController"
Erik Kline [Mon, 3 Jul 2017 08:24:41 +0000 (08:24 +0000)]
Merge "Switch IpManager and IpReachabilityMonitor to use SharedLog" am:
a3ea0e2337
am:
59079c2f8e
Change-Id: I7412970b8dcdab502ba2db7c7ec5be9f07f4bda2
Erik Kline [Mon, 3 Jul 2017 08:19:25 +0000 (08:19 +0000)]
Merge "Switch IpManager and IpReachabilityMonitor to use SharedLog"
am:
a3ea0e2337
Change-Id: I380551a59a1278df4cb6a0e7e590edae38e79881
Treehugger Robot [Mon, 3 Jul 2017 08:09:48 +0000 (08:09 +0000)]
Merge "Switch IpManager and IpReachabilityMonitor to use SharedLog"
Hugo Benichi [Thu, 29 Jun 2017 13:58:39 +0000 (22:58 +0900)]
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
Erik Kline [Thu, 29 Jun 2017 02:46:51 +0000 (11:46 +0900)]
Switch IpManager and IpReachabilityMonitor to use SharedLog
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- frameworks/opt/net/wifi/tests/wifitests/runtests.sh passes
- frameworks/base/wifi/tests/runtests.sh passes
- roamed from AP to AP watching IpRM logs accumulate
Bug:
62476366
Bug:
62162774
Merged-In: I4bef3b6b1975fa3c73cca0a0e95fad99708f061e
Merged-In: I265566158f3e5ebd21fb43e2eb0b8ba016fca76a
Change-Id: I155a26259420919eeed74166bacce3311caa49da
(cherry picked from commit
0fc10b2b1d7be649c80dda4ebdb2e31af216bfcc)
OSDN Git Service
