OSDN Git Service
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
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)]
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
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)
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: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'"
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
TreeHugger Robot [Sat, 1 Jul 2017 16:49:35 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-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
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
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"
Myles Watson [Sat, 1 Jul 2017 01:08:56 +0000 (01:08 +0000)]
Send disable messages when Bluetooth is disallowed
am:
6291fae585
Change-Id: I518dd5199322c60430bbd4f0433425adb17f5dc0
Mathieu Chartier [Fri, 30 Jun 2017 18:47:38 +0000 (11:47 -0700)]
Add boot profile support
If the boot profile file exists, its passed to the runtime as an
image compiler option. Also pass speed-profile for this case.
Bug:
37966211
Test: make, flash, and look at logcat during boot
(cherry picked from commit
f99e70e93408bd6dfda595866f13ba0068d4798e)
Change-Id: Ia09ff0200186382e45151b7cabb53016f8e0aa3f
Myles Watson [Thu, 29 Jun 2017 10:12:02 +0000 (03:12 -0700)]
Send disable messages when Bluetooth is disallowed
Bug:
63021124
Test: cts-tradefed run commandAndExit cts \
-m CtsDevicePolicyManagerTestCases \
-t com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Change-Id: I0ef538a4d0f0632ce303b29595ac1cab3b7d29ce
Steven Moreland [Fri, 30 Jun 2017 20:49:57 +0000 (20:49 +0000)]
Merge "hidl getService throw correct exceptions." am:
5d5ace5e11
am:
197b62d3fa
Change-Id: I720e34630733e27734f050d6546be4df1a1948ab
Steven Moreland [Fri, 30 Jun 2017 20:44:10 +0000 (20:44 +0000)]
Merge "hidl getService throw correct exceptions."
am:
5d5ace5e11
Change-Id: I16bcf1b32914ef42bbe788a8b67e92f6fe9d04a2
Treehugger Robot [Fri, 30 Jun 2017 20:36:36 +0000 (20:36 +0000)]
Merge "hidl getService throw correct exceptions."
Neil Fuller [Fri, 23 Jun 2017 15:43:45 +0000 (16:43 +0100)]
Add dumpsys support to RulesManagerService
Override the dump method so RuleManagerService can dump its state
into logs. Crude argument support has been added for dumping
specific fields in an easy to process way (for test scripts to use).
Tested with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above.
Test: Manual; adb shell dumpsys timezone [-format_state piscotz]
Bug:
31008728
Change-Id: I0ad83aa245232ed0b983ceacd8accfb876824d6f
Neil Fuller [Fri, 30 Jun 2017 12:45:16 +0000 (12:45 +0000)]
Merge "Track move of distro installer code" am:
8558d93db8
am:
50a15e7f6e
Change-Id: I5295f6e63ac9aafbebaa9870776e0502bf5129d7
Neil Fuller [Fri, 30 Jun 2017 12:38:05 +0000 (12:38 +0000)]
Merge "Track move of distro installer code"
am:
8558d93db8
Change-Id: I2d27a58c21b7b8931b1d058d6a6bc88eeb8f7709
Neil Fuller [Fri, 30 Jun 2017 12:28:23 +0000 (12:28 +0000)]
Merge "Track move of distro installer code"
Joel Scherpelz [Thu, 8 Jun 2017 06:35:21 +0000 (15:35 +0900)]
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
Change-Id: I2380b2383a593da35880d81cbade6eae4f79a776
liangweikang@xiaomi.com [Thu, 29 Jun 2017 06:36:30 +0000 (14:36 +0800)]
[BUG] java.util.MissingFormatArgumentException: Format specifier '%d'
Bug: https://issuetracker.google.com/issues/
63121293
Test: null
Change-Id: I2745c415e21a7f26535605cc5bef7eaf2109ae8e
Signed-off-by: liangweikang@xiaomi.com <liangweikang@xiaomi.com>
Ricardo Loo [Fri, 30 Jun 2017 00:51:57 +0000 (00:51 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev
am:
a89dfb5439
Change-Id: Ibaa0fd7bcbb1fa4eb880a53894fbf94d857f334f
Ricardo Loo [Fri, 30 Jun 2017 00:44:50 +0000 (00:44 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev
Chet Haase [Fri, 30 Jun 2017 00:32:27 +0000 (00:32 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev
am:
8cdbd6e184
Change-Id: I0d82ace7d340af8f66a6233ce5b474d26595c38f
TreeHugger Robot [Fri, 30 Jun 2017 00:21:28 +0000 (00:21 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev
Hall Liu [Thu, 29 Jun 2017 21:51:13 +0000 (21:51 +0000)]
Merge "Implement cancelDownload and remove appName" am:
9b43ffcf2f
am:
4b1acf4421
Change-Id: Ic6d19500c335bc40e6d14d009d4d459bf02b06e1
Hall Liu [Thu, 29 Jun 2017 21:45:47 +0000 (21:45 +0000)]
Merge "Implement cancelDownload and remove appName"
am:
9b43ffcf2f
Change-Id: I98914bf79ad6178e1ef8689acf5d0a18c78a7735
Hall Liu [Thu, 29 Jun 2017 21:33:11 +0000 (21:33 +0000)]
Merge "Implement cancelDownload and remove appName"
Sujith Ramakrishnan [Thu, 29 Jun 2017 18:59:07 +0000 (18:59 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am:
564d0bf1be
Change-Id: I1cd59a2966f692a4857343e21bf1586719939490
TreeHugger Robot [Thu, 29 Jun 2017 18:50:08 +0000 (18:50 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
Steven Moreland [Wed, 28 Jun 2017 17:21:00 +0000 (10:21 -0700)]
hidl getService throw correct exceptions.
NoSuchElementException needs to be thrown when getService is
called and the service is not available.
Test: hidl_test_java
Fixes:
63087967
Merged-In: I207098cfb732e888f91704f623e888e72e6ce7d9
Change-Id: I207098cfb732e888f91704f623e888e72e6ce7d9
Jack He [Thu, 29 Jun 2017 17:58:13 +0000 (17:58 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)" am:
874af710b7
am:
9fd5d0da1e
Change-Id: If22202112ad66a7b8d86438ca5d2947cf1842b8a
Jack He [Thu, 29 Jun 2017 17:53:10 +0000 (17:53 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)"
am:
874af710b7
Change-Id: Id65e6e11308c66893cb701af8909df9fee3a131f
Treehugger Robot [Thu, 29 Jun 2017 17:44:10 +0000 (17:44 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)"
Jack He [Wed, 21 Jun 2017 00:09:47 +0000 (17:09 -0700)]
Support battery level reporting via Apple VSC (1/2)
* Add related constants to BluetoothHeadset
Bug:
35874078
Test: make, test with supporting headsets
Change-Id: I9f49ea28efdf6de0e751a377d879fe13a47655d5
OSDN Git Service
