OSDN Git Service
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:43:56 +0000 (22:43 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
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: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:33:35 +0000 (14:33 +0000)]
Merge "ConnectivityManager: allow usage of TYPE_NONE"
am:
279f32ded5
Change-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962
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: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 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)
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: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:43:01 +0000 (09:43 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
am:
4148fe64b9
Change-Id: I31a8f64b4ee37a58bc83c08251d949f44cc26fd4
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: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:41:47 +0000 (09:41 +0000)]
Merge "Add dumpsys support to RulesManagerService"
am:
348a1d635d
Change-Id: Ib1b44ce174b625f2223dff72081ccfc7b2a9b390
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: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: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: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: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'"
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
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"
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
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: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>
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"
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: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
Jack He [Thu, 29 Jun 2017 17:25:26 +0000 (17:25 +0000)]
Merge "Support battery level reporting via Plantronics XEVENT (1/2)"
am:
c79c4240ec
Change-Id: I6aa50e541763adfa9ebe738d98d86152cf0cd1d5
Treehugger Robot [Thu, 29 Jun 2017 17:17:38 +0000 (17:17 +0000)]
Merge "Support battery level reporting via Plantronics XEVENT (1/2)"
Jack He [Wed, 21 Jun 2017 00:07:40 +0000 (17:07 -0700)]
Support battery level reporting via Plantronics XEVENT (1/2)
* Add related constants to BluetoothHeadset
Bug:
35874078
Test: make, test with supporting headsets
Change-Id: Ied089a065bf9caa0d03f681950fefa2ea990bb3e
Erik Kline [Thu, 29 Jun 2017 12:26:53 +0000 (12:26 +0000)]
Merge "No need to explicitly list ethernet upstream type"
am:
01017959fe
Change-Id: I93a74d80db134e832cef16d61abc057c88e86675
Treehugger Robot [Thu, 29 Jun 2017 12:18:35 +0000 (12:18 +0000)]
Merge "No need to explicitly list ethernet upstream type"
Neil Fuller [Thu, 29 Jun 2017 11:39:49 +0000 (12:39 +0100)]
Track move of distro installer code
Track move of distro installer code; reflect the new
build target.
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"
Bug:
31008728
Test: See above
Change-Id: Iad987d404af75af3694d50e25ed419889a9557f2
Neil Fuller [Thu, 29 Jun 2017 11:37:13 +0000 (11:37 +0000)]
Merge "Use sendBroadcastAsUser rather than sendBroadcast"
am:
d129a14647
Change-Id: I76324b2d983887dbdac4b26e518a68d8c4035a47
Treehugger Robot [Thu, 29 Jun 2017 11:29:37 +0000 (11:29 +0000)]
Merge "Use sendBroadcastAsUser rather than sendBroadcast"
Andre Eisenbach [Thu, 29 Jun 2017 08:39:40 +0000 (08:39 +0000)]
Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)"
am:
5790bae2f4
Change-Id: I480ef38d5aa61aa153ee53d325e8b249c1eab222
Andre Eisenbach [Thu, 29 Jun 2017 08:30:50 +0000 (08:30 +0000)]
Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)"
Jack He [Thu, 22 Jun 2017 19:56:54 +0000 (12:56 -0700)]
HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)
* Per HFP 1.7.1 spec page 102 of 144
EXTRA_HF_INDICATORS_IND_ID should be int
EXTRA_HF_INDICATORS_IND_VALUE should be int
Bug:
35874078
Test: make, PTS test, unit tests
runtest -c com.android.bluetooth.btservice.RemoteDevicesTest bluetooth
Change-Id: Idd316a82bab164b6ea1701bb261b1cc3dee196f1
Erik Kline [Wed, 21 Jun 2017 14:27:55 +0000 (23:27 +0900)]
No need to explicitly list ethernet upstream type
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
36076442
Change-Id: I743c20d5b969e33c6b10d0b47ac06e6b8c968acf
yinxu [Thu, 29 Jun 2017 02:05:53 +0000 (02:05 +0000)]
Merge "Use Bundle for inter-process message"
am:
db8e4efd5b
Change-Id: Ib93e91969063a5d2276c99b8b0fee4dd1a398771
Treehugger Robot [Thu, 29 Jun 2017 01:51:04 +0000 (01:51 +0000)]
Merge "Use Bundle for inter-process message"
Hall Liu [Fri, 23 Jun 2017 23:32:30 +0000 (16:32 -0700)]
Implement cancelDownload and remove appName
Implements the cancelDownload call
Removes appName as an argument from all EMBMS-related apis
Implements the cross-filesystem move method in MbmsDownloadReceiver
Change-Id: Ie8ebfccca4fbb3d69289beb2ed77101fe2c7727f
Hall Liu [Wed, 28 Jun 2017 20:36:49 +0000 (20:36 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
am:
c2f33f18eb
Change-Id: I7c2b0b34ed56bc506ce6139fb39649aec8319e81
Hall Liu [Wed, 28 Jun 2017 20:35:54 +0000 (20:35 +0000)]
Add download request tokens and enforce destination clear
am:
2043f70acb
Change-Id: I91e61d8f15815efc9f4d08d71d01944c096dc05f
Hall Liu [Wed, 28 Jun 2017 20:26:15 +0000 (20:26 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
* changes:
Implement the cleanup action in MbmsDownloadReceiver
Add download request tokens and enforce destination clear