git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Roland Levillain [Tue, 4 Jul 2017 11:22:32 +0000 (11:22 +0000)]

Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()""
am: 1e3624527b

Change-Id: If210f213c7840c218d5e847667c7613d53f86661

commit | commitdiff | tree

Roland Levillain [Tue, 4 Jul 2017 11:12:10 +0000 (11:12 +0000)]

Merge "Revert "ConnectivityServiceTest: more informative assert failures""

commit | commitdiff | tree

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

commit | commitdiff | tree

Roland Levillain [Tue, 4 Jul 2017 11:11:09 +0000 (11:11 +0000)]

Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()""

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hugo Benichi [Tue, 4 Jul 2017 09:43:01 +0000 (09:43 +0000)]

Merge "ConnectivityServiceTest: eliminate remaining sleep()"
am: 4148fe64b9

Change-Id: I31a8f64b4ee37a58bc83c08251d949f44cc26fd4

commit | commitdiff | tree

Hugo Benichi [Tue, 4 Jul 2017 09:42:51 +0000 (09:42 +0000)]

Merge changes I90c211dc,I4455f272 am: a0ff4efc8b
am: 2c856480a0

Change-Id: Ifc74828ff2932b3c1043ed27bc2f9a5fda32e3ee

commit | commitdiff | tree

Hugo Benichi [Tue, 4 Jul 2017 09:35:51 +0000 (09:35 +0000)]

Merge changes I90c211dc,I4455f272
am: a0ff4efc8b

Change-Id: I502d978ff636a00979d2083c39381bf600d3d6da

commit | commitdiff | tree

Treehugger Robot [Tue, 4 Jul 2017 09:25:53 +0000 (09:25 +0000)]

Merge "ConnectivityServiceTest: eliminate remaining sleep()"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Tue, 4 Jul 2017 03:38:34 +0000 (03:38 +0000)]

Merge "Wakeup packet mark/mask configuration option"

commit | commitdiff | tree

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

commit | commitdiff | tree

Neil Fuller [Mon, 3 Jul 2017 09:41:47 +0000 (09:41 +0000)]

Merge "Add dumpsys support to RulesManagerService"
am: 348a1d635d

Change-Id: Ib1b44ce174b625f2223dff72081ccfc7b2a9b390

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Neil Fuller [Mon, 3 Jul 2017 09:29:32 +0000 (09:29 +0000)]

Merge "Add dumpsys support to RulesManagerService"

commit | commitdiff | tree

Treehugger Robot [Mon, 3 Jul 2017 09:23:26 +0000 (09:23 +0000)]

Merge "Networking unit tests: fix some flaky tests"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Mon, 3 Jul 2017 08:30:30 +0000 (08:30 +0000)]

Merge "Pass all offload-exempt prefixes into OffloadController"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Mon, 3 Jul 2017 08:09:48 +0000 (08:09 +0000)]

Merge "Switch IpManager and IpReachabilityMonitor to use SharedLog"

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

Lorenzo Colitti [Mon, 3 Jul 2017 01:57:14 +0000 (01:57 +0000)]

Merge changes I6779a835,I4e3d8322 am: 1fbe962482
am: 3b3f420481

Change-Id: Ia160de158a931613754e57202de4f3cac610c7e0

commit | commitdiff | tree

Lorenzo Colitti [Mon, 3 Jul 2017 01:49:28 +0000 (01:49 +0000)]

Merge changes I6779a835,I4e3d8322
am: 1fbe962482

Change-Id: I99af01094a2e1d905f47b12822a036a1de6e3611

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Mon, 3 Jul 2017 00:17:57 +0000 (00:17 +0000)]

Merge "[BUG] java.util.MissingFormatArgumentException: Format specifier '%d'"

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Sat, 1 Jul 2017 16:49:35 +0000 (16:49 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Mathieu Chartier [Sat, 1 Jul 2017 03:32:41 +0000 (03:32 +0000)]

Merge "Add boot profile support"
am: 3d901ec513

Change-Id: I37db2f4bd7e6412954d51e914f6e238db5027a6e

commit | commitdiff | tree

Treehugger Robot [Sat, 1 Jul 2017 03:24:12 +0000 (03:24 +0000)]

Merge "Add boot profile support"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Steven Moreland [Fri, 30 Jun 2017 20:44:10 +0000 (20:44 +0000)]

Merge "hidl getService throw correct exceptions."
am: 5d5ace5e11

Change-Id: I16bcf1b32914ef42bbe788a8b67e92f6fe9d04a2

commit | commitdiff | tree

Treehugger Robot [Fri, 30 Jun 2017 20:36:36 +0000 (20:36 +0000)]

Merge "hidl getService throw correct exceptions."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Neil Fuller [Fri, 30 Jun 2017 12:28:23 +0000 (12:28 +0000)]

Merge "Track move of distro installer code"

commit | commitdiff | tree

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

commit | commitdiff | tree

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>

commit | commitdiff | tree

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

commit | commitdiff | tree

Ricardo Loo [Fri, 30 Jun 2017 00:44:50 +0000 (00:44 +0000)]

Merge "docs: Updated isAutofillSupported description." into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 30 Jun 2017 00:21:28 +0000 (00:21 +0000)]

Merge "Add docs for new padding/margin attributes." into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Hall Liu [Thu, 29 Jun 2017 21:45:47 +0000 (21:45 +0000)]

Merge "Implement cancelDownload and remove appName"
am: 9b43ffcf2f

Change-Id: I98914bf79ad6178e1ef8689acf5d0a18c78a7735

commit | commitdiff | tree

Hall Liu [Thu, 29 Jun 2017 21:33:11 +0000 (21:33 +0000)]

Merge "Implement cancelDownload and remove appName"

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 29 Jun 2017 18:50:08 +0000 (18:50 +0000)]

Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 29 Jun 2017 17:44:10 +0000 (17:44 +0000)]

Merge "Support battery level reporting via Apple VSC (1/2)"

commit | commitdiff | tree

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

commit | commitdiff | tree

Jack He [Thu, 29 Jun 2017 17:32:35 +0000 (17:32 +0000)]

Merge "Support battery level reporting via Plantronics XEVENT (1/2)" am: c79c4240ec
am: c286110c1a

Change-Id: I37cb48012b0f7170415693476d7e9f105798d814

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 29 Jun 2017 17:17:38 +0000 (17:17 +0000)]

Merge "Support battery level reporting via Plantronics XEVENT (1/2)"

commit | commitdiff | tree

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

commit | commitdiff | tree

Scott Main [Thu, 29 Jun 2017 16:19:25 +0000 (16:19 +0000)]

Merge "add links to Log class summary for methods and logcat doc" into oc-dev
am: ea6fea4d5d

Change-Id: I205254f618a3a405aab6f783f5d7de99c9a3a907

commit | commitdiff | tree

Scott Main [Thu, 29 Jun 2017 16:12:47 +0000 (16:12 +0000)]

Merge "add links to Log class summary for methods and logcat doc" into oc-dev

commit | commitdiff | tree

Chet Haase [Thu, 29 Jun 2017 14:54:19 +0000 (07:54 -0700)]

Add docs for new padding/margin attributes.

The attributes for View, paddingHorizontal and paddingVertical,
were added in the O release and are documented in R.attr. But they
should also be referenced in View itself, alongside the other
padding parameters.

Similarly, the new layout_MarginHorizontal and
layout_marginVertical should be referenced in
ViewGroup.MarginLayoutParams.

Bug: 63128350 Add docs about new padding/margin params
Test: built docs, checked the result
Change-Id: I3021df5ea83c469811b4a6ec6ecd3ab2966ec384

commit | commitdiff | tree

Erik Kline [Thu, 29 Jun 2017 12:35:15 +0000 (12:35 +0000)]

Merge "No need to explicitly list ethernet upstream type" am: 01017959fe
am: 065e3a7786

Change-Id: I5442a9298822af5f6cbfa2570906bc38018c07e4

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 29 Jun 2017 12:18:35 +0000 (12:18 +0000)]

Merge "No need to explicitly list ethernet upstream type"

commit | commitdiff | tree

Neil Fuller [Thu, 29 Jun 2017 11:45:04 +0000 (11:45 +0000)]

Merge "Use sendBroadcastAsUser rather than sendBroadcast" am: d129a14647
am: 93b232db41

Change-Id: I749e98ea84dd8c3811d302848a14576c6aff8fb1

commit | commitdiff | tree

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

commit | commitdiff | tree

Neil Fuller [Thu, 29 Jun 2017 11:37:13 +0000 (11:37 +0000)]

Merge "Use sendBroadcastAsUser rather than sendBroadcast"
am: d129a14647

Change-Id: I76324b2d983887dbdac4b26e518a68d8c4035a47

commit | commitdiff | tree

Treehugger Robot [Thu, 29 Jun 2017 11:29:37 +0000 (11:29 +0000)]

Merge "Use sendBroadcastAsUser rather than sendBroadcast"

commit | commitdiff | tree

Andre Eisenbach [Thu, 29 Jun 2017 08:45:01 +0000 (08:45 +0000)]

Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)" am: 5790bae2f4
am: df1831d2ee

Change-Id: I33fb994d049b033d9e58bbc080fa6ce1efc8e240

commit | commitdiff | tree

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

commit | commitdiff | tree

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)"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

yinxu [Thu, 29 Jun 2017 02:12:05 +0000 (02:12 +0000)]

Merge "Use Bundle for inter-process message" am: db8e4efd5b
am: 5311da134a

Change-Id: I0b7d8ee5827c97fc761cb1fe102d4b89b364e9f7

commit | commitdiff | tree

yinxu [Thu, 29 Jun 2017 02:05:53 +0000 (02:05 +0000)]

Merge "Use Bundle for inter-process message"
am: db8e4efd5b

Change-Id: Ib93e91969063a5d2276c99b8b0fee4dd1a398771

commit | commitdiff | tree

Andrii Kulian [Thu, 29 Jun 2017 01:57:32 +0000 (01:57 +0000)]

Merge "Further restrict activity launch on virtual displays" into oc-dev
am: 36dbd3d43f

Change-Id: I30a4083e9c8467dd8698b50f0999b5ae20f2e01c

commit | commitdiff | tree

Treehugger Robot [Thu, 29 Jun 2017 01:51:04 +0000 (01:51 +0000)]

Merge "Use Bundle for inter-process message"