Commit Graph

78618 Commits

Author SHA1 Message Date
Roland Levillain
bdcebe39e6 Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 10c314e19a
am: d3f26b6731

Change-Id: I9d7be7013b1d70c5f3b1fef0399236c105f4196f
2017-07-04 11:37:27 +00:00
Roland Levillain
d3f26b6731 Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""
am: 10c314e19a

Change-Id: I49221522c1a9a6e7d4ae72529c1a47b736e26a39
2017-07-04 11:31:30 +00:00
Roland Levillain
afd69a0d57 Revert "ConnectivityManager: allow usage of TYPE_NONE"
This CL is breaking some internal builds.

This reverts commit 726931ebf4.

Change-Id: Ie79214808d84c73f54a525f515b4c90a3fb23542
2017-07-04 11:14:03 +00:00
Hugo Benichi
d0e5f1d280 Merge changes I90c211dc,I4455f272 am: a0ff4efc8b
am: 2c856480a0

Change-Id: Ifc74828ff2932b3c1043ed27bc2f9a5fda32e3ee
2017-07-04 09:42:51 +00:00
Hugo Benichi
2c856480a0 Merge changes I90c211dc,I4455f272
am: a0ff4efc8b

Change-Id: I502d978ff636a00979d2083c39381bf600d3d6da
2017-07-04 09:35:51 +00:00
Treehugger Robot
a0ff4efc8b Merge changes I90c211dc,I4455f272
* changes:
  ConnectivityServiceTest: more informative assert failures
  ConnectivityManager: allow usage of TYPE_NONE
2017-07-04 09:22:07 +00:00
Hugo Benichi
726931ebf4 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
2017-07-04 16:22:59 +09:00
Neil Fuller
61ea5e6c8f Merge "Add dumpsys support to RulesManagerService" am: 348a1d635d
am: 06c2f8e346

Change-Id: I23f60a0c235780afd551cbe5f546918317bfe098
2017-07-03 09:47:03 +00:00
Neil Fuller
06c2f8e346 Merge "Add dumpsys support to RulesManagerService"
am: 348a1d635d

Change-Id: Ib1b44ce174b625f2223dff72081ccfc7b2a9b390
2017-07-03 09:41:47 +00:00
Neil Fuller
87b1128ddc 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
2017-06-30 18:18:07 +01:00
Ricardo Loo
a8bccb6674 Merge "docs: Updated isAutofillSupported description." into oc-dev
am: a89dfb5439

Change-Id: Ibaa0fd7bcbb1fa4eb880a53894fbf94d857f334f
2017-06-30 00:51:57 +00:00
Ricardo Loo
a89dfb5439 Merge "docs: Updated isAutofillSupported description." into oc-dev 2017-06-30 00:44:50 +00:00
Chet Haase
1040b18dc3 Merge "Add docs for new padding/margin attributes." into oc-dev
am: 8cdbd6e184

Change-Id: I0d82ace7d340af8f66a6233ce5b474d26595c38f
2017-06-30 00:32:27 +00:00
TreeHugger Robot
8cdbd6e184 Merge "Add docs for new padding/margin attributes." into oc-dev 2017-06-30 00:21:28 +00:00
Sujith Ramakrishnan
a1157b3aa1 Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am: 564d0bf1be

Change-Id: I1cd59a2966f692a4857343e21bf1586719939490
2017-06-29 18:59:07 +00:00
TreeHugger Robot
564d0bf1be Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev 2017-06-29 18:50:08 +00:00
Jack He
8d9e7be8e4 Merge "Support battery level reporting via Apple VSC (1/2)" am: 874af710b7
am: 9fd5d0da1e

Change-Id: If22202112ad66a7b8d86438ca5d2947cf1842b8a
2017-06-29 17:58:13 +00:00
Jack He
9fd5d0da1e Merge "Support battery level reporting via Apple VSC (1/2)"
am: 874af710b7

Change-Id: Id65e6e11308c66893cb701af8909df9fee3a131f
2017-06-29 17:53:10 +00:00
Jack He
679d0bc8f9 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
2017-06-29 17:43:32 +00:00
Jack He
b01caeeb94 Merge "Support battery level reporting via Plantronics XEVENT (1/2)" am: c79c4240ec
am: c286110c1a

Change-Id: I37cb48012b0f7170415693476d7e9f105798d814
2017-06-29 17:32:35 +00:00
Jack He
c286110c1a Merge "Support battery level reporting via Plantronics XEVENT (1/2)"
am: c79c4240ec

Change-Id: I6aa50e541763adfa9ebe738d98d86152cf0cd1d5
2017-06-29 17:25:26 +00:00
Jack He
0fcbba25b7 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
2017-06-29 17:17:14 +00:00
Scott Main
afeb63d823 Merge "add links to Log class summary for methods and logcat doc" into oc-dev
am: ea6fea4d5d

Change-Id: I205254f618a3a405aab6f783f5d7de99c9a3a907
2017-06-29 16:19:25 +00:00
Scott Main
ea6fea4d5d Merge "add links to Log class summary for methods and logcat doc" into oc-dev 2017-06-29 16:12:47 +00:00
Chet Haase
353d397d17 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
2017-06-29 07:54:19 -07:00
Neil Fuller
95eab26704 Merge "Use sendBroadcastAsUser rather than sendBroadcast" am: d129a14647
am: 93b232db41

Change-Id: I749e98ea84dd8c3811d302848a14576c6aff8fb1
2017-06-29 11:45:04 +00:00
Neil Fuller
93b232db41 Merge "Use sendBroadcastAsUser rather than sendBroadcast"
am: d129a14647

Change-Id: I76324b2d983887dbdac4b26e518a68d8c4035a47
2017-06-29 11:37:13 +00:00
Treehugger Robot
d129a14647 Merge "Use sendBroadcastAsUser rather than sendBroadcast" 2017-06-29 11:29:37 +00:00
Andre Eisenbach
83e46cbacc Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)" am: 5790bae2f4
am: df1831d2ee

Change-Id: I33fb994d049b033d9e58bbc080fa6ce1efc8e240
2017-06-29 08:45:01 +00:00
Andre Eisenbach
df1831d2ee Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)"
am: 5790bae2f4

Change-Id: I480ef38d5aa61aa153ee53d325e8b249c1eab222
2017-06-29 08:39:40 +00:00
Jack He
73795440a5 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
2017-06-29 08:30:37 +00:00
Robert Carr
1c89591f94 Merge "Disable requestVisibleBehind." into oc-dev
am: e33c33e38a

Change-Id: Ie0733cb79acbe34536c4c031f1234dac134841d3
2017-06-29 00:26:35 +00:00
TreeHugger Robot
e33c33e38a Merge "Disable requestVisibleBehind." into oc-dev 2017-06-29 00:17:19 +00:00
Scott Main
450a5bb81c add links to Log class summary for methods and logcat doc
bug: 29123084

Change-Id: Ida1351ca3647faa133905c5ff85df716bffd3203
2017-06-28 23:02:02 +00:00
Sujith Ramakrishnan
0390fff82c Prevent unwanted keypress actions during TV Setup.
- Prevent Search or long-press Home actions
      while TV setup is being completed based
      on flag TV_USER_SETUP_COMPLETE.

Test: Manual - Reset device, ran Setup, tried keys.
Test: Manual - Rebooted device after Setup, tried keys.

Bug: 62419382
Change-Id: Ic8fb0f10943ab7c39a7d9857f62e6ab292231b40
2017-06-28 14:38:30 -07:00
Jack He
3b22538b46 Merge "Add APIs to get remote device's battery level (1/2)" am: ceaccbfe70
am: 96f98f255b

Change-Id: I004b05f007def7f995112b867f102fe11b88064d
2017-06-28 08:37:50 +00:00
Jack He
96f98f255b Merge "Add APIs to get remote device's battery level (1/2)"
am: ceaccbfe70

Change-Id: Ic3253ef666632aaaffe8e1547dc563cd3bca9e37
2017-06-28 08:32:54 +00:00
Jack He
1d312bfa78 Add APIs to get remote device's battery level (1/2)
* Add BluetoothDevice.getBatteryLevel() API to retreive battery level
  information of remote device
* Add BluetoothDevice.ACTION_BATTERY_LEVEL_CHANGED intent to notify user
  that remote device's battery level has changed

Bug: 35874078
Test: make, pair with devices and use them
Change-Id: I41051ee25383f5f3a1e505aef6f8c526385f58bd
2017-06-27 16:53:09 -07:00
Ricardo Loo
33d226c953 docs: Updated isAutofillSupported description.
The description for `AutofillManager.isAutofillSupported` doesn't make
clear that either the device or the user can make autofill unsupported.

Bug: 62604325
Test: Ran 'make ds-docs -j16' and staged content to
go/dac-stage/reference/android/view/autofill/AutofillManager.html#isAutofillSupported()

Change-Id: I298b9f535e23dc3cb54fabed36642523753c13a5
2017-06-27 14:17:33 -07:00
Robert Carr
8661c5e519 Disable requestVisibleBehind.
As there is no caller for the SystemAPI convertToTranslucent, there is no situation
where requestVisibleBehind will actually result in the activity becoming
visible behind. However we have bugs in the requestVisibleBehind code-path,
so rather than fix them...it seems better to just prevent ourselves from
running in to them. Full deletion of the code-path is scheduled for post-O
branches.

Change-Id: I6e7c79e036986564d2d443a603e63c341de23057
Fixes: 62512584
Test: Repro from bug. go/wm-smoke.
2017-06-27 13:46:14 -07:00
Neil Fuller
23eb3a19b8 Use sendBroadcastAsUser rather than sendBroadcast
According to messages in the logcat sendBroadcastAsUser
is the better option.

Test: Manual
Bug: 31008728
Change-Id: I06bcd3c53878fc2b1b817337ea8719fcc4975501
2017-06-27 19:04:50 +01:00
Bryce Lee
0259473b75 Merge "Add aborted start result." into oc-dev
am: 8796c20dae

Change-Id: I893c429db5c71747fda8e390ee7d9d786ce0c53a
2017-06-27 04:20:34 +00:00
Bryce Lee
8796c20dae Merge "Add aborted start result." into oc-dev 2017-06-27 04:14:26 +00:00
Makoto Onuki
36520c229f Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
am: 9f607f4c0b

Change-Id: Iddf617784c20bfd835413e934071aea3b02d5d6c
2017-06-26 23:31:56 +00:00
Bryce Lee
f9d4954f30 Add aborted start result.
Previously, we were returning START_SUCCESS when ActivityStarter
aborted launching the activity. This hides this activity and makes it
harder to debug.

This CL adds a new start result type to capture this internally.

Bug: 38121026
Test: manual
Test: go/wm-smoke
Change-Id: I97699b22b1eff476724c48db0c29daa0566ad280
2017-06-26 16:27:32 -07:00
TreeHugger Robot
9f607f4c0b Merge "Fix activity icon badging for non-bitmap icons" into oc-dev 2017-06-26 23:25:17 +00:00
Selim Cinek
12a2a7d0f1 Merge "Fixed an issue in the contrast calculation" into oc-dev
am: 9bf5c0c3e1

Change-Id: Ic93f722459de8da30b9b2f8971dfd0b650e37f10
2017-06-24 00:55:48 +00:00
Selim Cinek
9bf5c0c3e1 Merge "Fixed an issue in the contrast calculation" into oc-dev 2017-06-24 00:44:13 +00:00
Selim Cinek
4c80791919 Fixed an issue in the contrast calculation
The parameters were passed the wrong way around.

Test: manual inspection
Fixes: 62937149
Change-Id: I7ae2bb2a4136da37d6b59b2b1406c68ce7fe7b6b
2017-06-23 17:29:50 -07:00
Hugo Benichi
c729ff8253 Merge changes I193297e0,I43beb966
* changes:
  NetworkCapabilities: Added support for TRANSPORT_LOWPAN
  Connectivity metrics: serialize networkId, transports, ifname
2017-06-24 00:01:24 +00:00