OSDN Git Service
Erik Kline [Wed, 5 Jul 2017 03:07:21 +0000 (03:07 +0000)]
Switch to USB_CONFIGURED as the primary USB readiness signal
am:
c438e306cc
Change-Id: I717fdd269b012f32548ebe0603999ae403b03100
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
Change-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
Roland Levillain [Tue, 4 Jul 2017 11:46:56 +0000 (11:46 +0000)]
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am:
10c314e19a am:
d3f26b6731
am:
bdcebe39e6
Change-Id: I428cb473221a403e3c78cbc5d1224d46747ec315
Roland Levillain [Tue, 4 Jul 2017 11:43:07 +0000 (11:43 +0000)]
Merge "Revert "ConnectivityServiceTest: more informative assert failures"" am:
d10790c902 am:
8f68232271
am:
3b2b9b6238
Change-Id: Id038c0f03a0edaff27b51878a6e2ee7aace7e7cb
Roland Levillain [Tue, 4 Jul 2017 11:41:37 +0000 (11:41 +0000)]
Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am:
1e3624527b am:
962f1842ca
am:
a3909e0583
Change-Id: I8ecc2290d58b9e8f570ec404bbde1a2a60a89b75
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:55:04 +0000 (09:55 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am:
4148fe64b9 am:
1005e82639
am:
2a7985a6d0
Change-Id: I3d53ece1c18cf1cf1e5e361231e321dcd59b5bad
Hugo Benichi [Tue, 4 Jul 2017 09:49:06 +0000 (09:49 +0000)]
Merge changes I90c211dc,I4455f272 am:
a0ff4efc8b am:
2c856480a0
am:
d0e5f1d280
Change-Id: Ia79936c51ec8236d5c92c19a8d2a3dff34f0e1a1
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
Erik Kline [Tue, 4 Jul 2017 06:05:49 +0000 (06:05 +0000)]
Merge "Pass all offload-exempt prefixes into OffloadController" into oc-dr1-dev
am:
1d8d34fa3e -s ours
Change-Id: I7c3bdf71367f9f6888ffc76afb7e69de1a26c9f0
TreeHugger Robot [Tue, 4 Jul 2017 05:58:46 +0000 (05:58 +0000)]
Merge "Pass all offload-exempt prefixes into OffloadController" into oc-dr1-dev
Joel Scherpelz [Tue, 4 Jul 2017 04:07:56 +0000 (04:07 +0000)]
Merge "Wakeup packet mark/mask configuration option" am:
b975c88178 am:
01860f8ea5
am:
48360082bc
Change-Id: Ie5c88f5b91248a5f069decc0708f17af4b649710
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"
Tobias Thierer [Mon, 3 Jul 2017 15:21:03 +0000 (15:21 +0000)]
Merge changes from topic 'revert-update-conscrypt' into oc-dr1-dev
am:
b2b73e4956
Change-Id: I7b97fd34f5007f52804c45e539f493184bcf8c0d
Tobias Thierer [Mon, 3 Jul 2017 15:16:26 +0000 (15:16 +0000)]
Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE.
am:
c20c2ea28e -s ours
Change-Id: I8f51100a3429f0a604e6b93c17cd149f644b1256
TreeHugger Robot [Mon, 3 Jul 2017 15:07:20 +0000 (15:07 +0000)]
Merge changes from topic 'revert-update-conscrypt' into oc-dr1-dev
* changes:
Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE.
Revert "Delete obsolete and unused KeyStoreTests". DO NOT MERGE ANYWHERE.
Selim Cinek [Mon, 3 Jul 2017 13:43:31 +0000 (13:43 +0000)]
Merge "Improved Text transformations for notifications" into oc-dr1-dev
am:
19dc697f33
Change-Id: Id09a2eabdda8a6fcd3e41760c0c4ddfa418af412
TreeHugger Robot [Mon, 3 Jul 2017 13:37:33 +0000 (13:37 +0000)]
Merge "Improved Text transformations for notifications" into oc-dr1-dev
Adrian Roos [Mon, 3 Jul 2017 12:22:53 +0000 (12:22 +0000)]
Merge "AOD: Avoid double re-registration of sensors" into oc-dr1-dev
am:
fc73208ec9
Change-Id: Iff1960bfe0d69b2afd3df4fd0f7d7d6a5bffa78e
TreeHugger Robot [Mon, 3 Jul 2017 12:15:57 +0000 (12:15 +0000)]
Merge "AOD: Avoid double re-registration of sensors" into oc-dr1-dev
Selim Cinek [Mon, 3 Jul 2017 10:53:14 +0000 (10:53 +0000)]
Merge "Fixed an issue where the shelf could be hidden" into oc-dr1-dev
am:
fdc84a13a2
Change-Id: I6c90944ad0db3d309210f1df1d0a1c33bc13cc71
Selim Cinek [Mon, 3 Jul 2017 10:46:35 +0000 (10:46 +0000)]
Merge "Fixed an issue where the shelf could be hidden" into oc-dr1-dev
Neil Fuller [Mon, 3 Jul 2017 09:53:28 +0000 (09:53 +0000)]
Merge "Add dumpsys support to RulesManagerService" am:
348a1d635d am:
06c2f8e346
am:
61ea5e6c8f
Change-Id: If516a2daeeb38490add4570bbd937801906b356d
Hugo Benichi [Mon, 3 Jul 2017 09:51:26 +0000 (09:51 +0000)]
Merge "Networking unit tests: fix some flaky tests" am:
501bae6492 am:
b87cf12ad3
am:
741fdea598
Change-Id: Ie5d8f2e01d14c4dc4fc83d1645130258ba92998d
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 [Sat, 24 Jun 2017 10:29:10 +0000 (19:29 +0900)]
Pass all offload-exempt prefixes into OffloadController
Additionally:
- eliminate useless TetherMasterUtilState
Test: as follows
- built
- flashed
- booted
- runtest frameworks passes
Bug:
29337859
Bug:
32163131
Merged-In: I6adcdbd6a4f14bd2cdaa056cfc0cf9c573a165b9
Merged-In: I5e689bcf5dd048ee9f9bd0c32b16d7c2e4c0268d
Merged-In: Ifd3817bd4569682d77a70f8192432391a573f6d8
Merged-In: I1ea57fbe322e26246f1d8b459519f18be1297467
Change-Id: I0482ac9dd9e8ba558b253643dbc01875ce9475ef
(cherry picked from commit
be8ee08f5dcc3627cac6b0baa6664637684cce35)
Erik Kline [Mon, 3 Jul 2017 08:53:35 +0000 (08:53 +0000)]
Merge "Pass all offload-exempt prefixes into OffloadController" am:
7fc4f63f23 am:
96ef858957
am:
d02751efed
Change-Id: I5e689bcf5dd048ee9f9bd0c32b16d7c2e4c0268d
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
Erik Kline [Mon, 3 Jul 2017 08:30:48 +0000 (08:30 +0000)]
Merge "Switch IpManager and IpReachabilityMonitor to use SharedLog" am:
a3ea0e2337 am:
59079c2f8e
am:
b6b9542479 -s ours
Change-Id: Ifb1ed162ac6d87a3f2fc3fb6cda01ba410be3571
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)
Erik Kline [Mon, 3 Jul 2017 06:25:26 +0000 (06:25 +0000)]
Switch IpManager and IpReachabilityMonitor to use SharedLog
am:
0fc10b2b1d
Change-Id: I265566158f3e5ebd21fb43e2eb0b8ba016fca76a
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
Change-Id: I155a26259420919eeed74166bacce3311caa49da
Lorenzo Colitti [Mon, 3 Jul 2017 02:02:47 +0000 (02:02 +0000)]
Merge changes I6779a835,I4e3d8322 am:
1fbe962482 am:
3b3f420481
am:
85e632257b
Change-Id: Ia28e03ec95f4a1f3a6708bcd0610ef5887f75a06
Lorenzo Colitti [Mon, 3 Jul 2017 01:57:14 +0000 (01:57 +0000)]
Merge changes I6779a835,I4e3d8322 am:
1fbe962482
am:
3b3f420481
Change-Id: Ia160de158a931613754e57202de4f3cac610c7e0
Lorenzo Colitti [Mon, 3 Jul 2017 01:49:28 +0000 (01:49 +0000)]
Merge changes I6779a835,I4e3d8322
am:
1fbe962482
Change-Id: I99af01094a2e1d905f47b12822a036a1de6e3611
Lorenzo Colitti [Mon, 3 Jul 2017 01:39:32 +0000 (01:39 +0000)]
Merge changes I6779a835,I4e3d8322
* changes:
Only connect to one address per address family.
Update our user agent to something newer.
liangweikang@xiaomi.com [Mon, 3 Jul 2017 00:40:18 +0000 (00:40 +0000)]
Merge "[BUG] java.util.MissingFormatArgumentException: Format specifier '%d'" am:
02309e9748 am:
6a2fcae638
am:
a900930d58
Change-Id: I180c73a8dc41ea907c1e7fd76624fce0a4b523d3
liangweikang@xiaomi.com [Mon, 3 Jul 2017 00:34:42 +0000 (00:34 +0000)]
Merge "[BUG] java.util.MissingFormatArgumentException: Format specifier '%d'" am:
02309e9748
am:
6a2fcae638
Change-Id: I6dbd5e99ab67ffe5f086bb7c310473da6527f93a
liangweikang@xiaomi.com [Mon, 3 Jul 2017 00:26:47 +0000 (00:26 +0000)]
Merge "[BUG] java.util.MissingFormatArgumentException: Format specifier '%d'"
am:
02309e9748
Change-Id: I1687f90ae7d042db2575ca10b168833e27adc7cb
Treehugger Robot [Mon, 3 Jul 2017 00:17:57 +0000 (00:17 +0000)]
Merge "[BUG] java.util.MissingFormatArgumentException: Format specifier '%d'"
Android Build Merger (Role) [Sat, 1 Jul 2017 17:10:01 +0000 (17:10 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
c393596c5c -s ours am:
0e0b89a3e9 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Sat, 1 Jul 2017 17:08:41 +0000 (17:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
c393596c5c -s ours
am:
0e0b89a3e9 -s ours
Change-Id: I07267b6b14b2f96fc1321d003b19f5138808fd73
Bill Yi [Sat, 1 Jul 2017 17:08:40 +0000 (17:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
c393596c5c -s ours
am:
e1e9f796a0 -s ours
Change-Id: Ia729aedbc95c45bfad02fffb8704aaf9fd271f10
Bill Yi [Sat, 1 Jul 2017 16:59:41 +0000 (16:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
c393596c5c -s ours
Change-Id: Idaf923acd47974e468c4793a65535266478467ee
Bill Yi [Sat, 1 Jul 2017 16:59:40 +0000 (16:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
c393596c5c -s ours
Change-Id: I7acaa0bdef39fc5c3d14b47ee63a1ce5da99c8ed
Bill Yi [Sat, 1 Jul 2017 16:56:31 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
6eb3418ea7 -s ours
Change-Id: Iaabcd416d7c51bec1b821c709932fa758d9bc987
Bill Yi [Sat, 1 Jul 2017 16:55:09 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
015210bc77 -s ours
Change-Id: I82210a83455d828cd4fda585127dac791c67235e
TreeHugger Robot [Sat, 1 Jul 2017 16:49:35 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Sat, 1 Jul 2017 16:48:37 +0000 (16:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 1 Jul 2017 16:48:03 +0000 (16:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 1 Jul 2017 16:20:14 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
5dac6662eb -s ours
Change-Id: I77f671f447ddf1a9e169adc6ae9ef81dc8f19c86
TreeHugger Robot [Sat, 1 Jul 2017 16:10:37 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Erik Kline [Sat, 24 Jun 2017 10:29:10 +0000 (19:29 +0900)]
Pass all offload-exempt prefixes into OffloadController
Additionally:
- eliminate useless TetherMasterUtilState
Test: as follows
- built
- flashed
- booted
- runtest frameworks passes
Bug:
29337859
Bug:
32163131
Change-Id: I0482ac9dd9e8ba558b253643dbc01875ce9475ef
Bill Yi [Sat, 1 Jul 2017 08:05:57 +0000 (01:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie1d41a529933932afe08bd0a4379a8c39566bba2
Auto-generated-cl: translation import
Lorenzo Colitti [Wed, 28 Jun 2017 14:42:41 +0000 (23:42 +0900)]
Only connect to one address per address family.
This ensures probes don't take too long when a host has
multiple addresses. So for example:
$ adb shell settings put global captive_portal_http_url http://play.googleapis.com/generate_204
$ host play.googleapis.com
play.googleapis.com is an alias for googleapis.l.google.com.
googleapis.l.google.com has address 216.58.196.234
googleapis.l.google.com has address 216.58.197.10
googleapis.l.google.com has address 172.217.26.106
googleapis.l.google.com has address 172.217.27.170
googleapis.l.google.com has address 216.58.199.234
googleapis.l.google.com has address 216.58.221.170
googleapis.l.google.com has IPv6 address 2404:6800:400a:807::200a
results in:
06-29 21:38:09.695 - PROBE_DNS play.googleapis.com 270ms OK 2404:6800:400a:806::200a,172.217.26.106
Bug:
36532213
Test: as described in commit description
Change-Id: I6779a8356bac8d4a3912b0822379d45dfc662541
Bill Yi [Sat, 1 Jul 2017 05:21:21 +0000 (22:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68c61a6bc5bb8b5ea580383d10702bac0e7db254
Auto-generated-cl: translation import
Bill Yi [Sat, 1 Jul 2017 05:09:25 +0000 (22:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ec049d1c524feca0bba33fdb21ef03960a50c5a
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 1 Jul 2017 03:48:25 +0000 (03:48 +0000)]
Merge "Merge "AOD: Pause FalsingManager prox sensor while showing AOD" into oc-dr1-dev am:
75c94b8788" into oc-dr1-dev-plus-aosp
Mathieu Chartier [Sat, 1 Jul 2017 03:47:10 +0000 (03:47 +0000)]
Merge "Add boot profile support" am:
3d901ec513 am:
7e73b5165d
am:
3fcea88d83
Change-Id: I489ce24e496e26aa1e96ac7d5a054305650f05d1
Adrian Roos [Sat, 1 Jul 2017 03:47:10 +0000 (03:47 +0000)]
Merge "AOD: Pause FalsingManager prox sensor while showing AOD" into oc-dr1-dev
am:
75c94b8788
Change-Id: Ib63b7c38dbb68b3f628c38762cbe9647aabf7a46
TreeHugger Robot [Sat, 1 Jul 2017 03:39:06 +0000 (03:39 +0000)]
Merge "AOD: Pause FalsingManager prox sensor while showing AOD" into oc-dr1-dev
Mathieu Chartier [Sat, 1 Jul 2017 03:37:36 +0000 (03:37 +0000)]
Merge "Add boot profile support" am:
3d901ec513
am:
7e73b5165d
Change-Id: I440e67c9328fa482bc08f435180a56d12d4aa38c
Mathieu Chartier [Sat, 1 Jul 2017 03:32:41 +0000 (03:32 +0000)]
Merge "Add boot profile support"
am:
3d901ec513
Change-Id: I37db2f4bd7e6412954d51e914f6e238db5027a6e
Treehugger Robot [Sat, 1 Jul 2017 03:24:12 +0000 (03:24 +0000)]
Merge "Add boot profile support"
Android Build Merger (Role) [Sat, 1 Jul 2017 01:19:37 +0000 (01:19 +0000)]
Merge "Send disable messages when Bluetooth is disallowed am:
6291fae585 am:
70fe2c994b" into oc-dr1-dev-plus-aosp
Myles Watson [Sat, 1 Jul 2017 01:18:29 +0000 (01:18 +0000)]
Send disable messages when Bluetooth is disallowed am:
6291fae585
am:
70fe2c994b
Change-Id: I19da2925ef94a803e746bf1d4a390bcc5d7a6429
Myles Watson [Sat, 1 Jul 2017 01:17:56 +0000 (01:17 +0000)]
Send disable messages when Bluetooth is disallowed am:
6291fae585
am:
924ef1f310
Change-Id: I1c1da8f3e5280b4804cb6cf9e57b14b29e1fe9c2
Myles Watson [Sat, 1 Jul 2017 01:08:56 +0000 (01:08 +0000)]
Send disable messages when Bluetooth is disallowed
am:
6291fae585
Change-Id: I13f4e42ceaab9b1dee41d3a43c0a1a5e8f188fff
OSDN Git Service
