Commit Graph

70372 Commits

Author SHA1 Message Date
TreeHugger Robot
f7a8befbec Merge "Add PC feature flag" 2017-04-24 17:54:13 +00:00
Nicolas Geoffray
04fbbec585 Merge "Drop REASON_FORCED_DEXOPT." 2017-04-24 10:42:46 +00:00
Felipe Leme
0fd0e895ca Merge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into oc-dev am: 7bb113566f
am: 4778d6d5d8

Change-Id: I41425c9a1e875885c4a8c9729b5b1b942d5fdf05
2017-04-22 04:34:32 +00:00
Felipe Leme
4778d6d5d8 Merge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into oc-dev
am: 7bb113566f

Change-Id: Ie16d1154d61a6fc323a53998d09456f524b9e3b4
2017-04-22 04:28:33 +00:00
TreeHugger Robot
7bb113566f Merge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into oc-dev 2017-04-22 04:20:42 +00:00
Sudheer Shanka
a9a28a17b9 Merge "Fix a spelling." into oc-dev am: 1939550fba
am: ba16a5b5e9

Change-Id: Ibde673514841f823df5bc2c7e6a1220955537d26
2017-04-22 02:45:24 +00:00
Sudheer Shanka
ba16a5b5e9 Merge "Fix a spelling." into oc-dev
am: 1939550fba

Change-Id: Ic2604fa1bd426a9fdfa5269f8a408ba5bb69b62e
2017-04-22 02:38:57 +00:00
TreeHugger Robot
1939550fba Merge "Fix a spelling." into oc-dev 2017-04-22 02:32:39 +00:00
Andrii Kulian
44118a5391 Merge "Don't put non-resizeable activities on secondary displays" into oc-dev am: b216d0f09f
am: 9ca1490cbe

Change-Id: Id1ddad10cf696e96d556fb2a77f8ee6458f384a0
2017-04-22 01:13:56 +00:00
Andrii Kulian
9ca1490cbe Merge "Don't put non-resizeable activities on secondary displays" into oc-dev
am: b216d0f09f

Change-Id: I026dfe6834c891251731fcf852366d20a112b864
2017-04-22 01:07:58 +00:00
Hugo Benichi
18924f495b Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2 am: d2181235b9
am: 658f2e5cd7

Change-Id: I86a9db7fe4f925162e1632152862c7b246230db9
2017-04-22 01:06:17 +00:00
Andrii Kulian
b216d0f09f Merge "Don't put non-resizeable activities on secondary displays" into oc-dev 2017-04-22 00:59:39 +00:00
Hugo Benichi
658f2e5cd7 Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2
am: d2181235b9

Change-Id: I7a5202be0e6a6274f3bd11737f30fee0ef947235
2017-04-22 00:57:48 +00:00
Hugo Benichi
d2181235b9 Merge "NsdManager: add unit tests" am: dc54ad7fc3
am: 40ab8401b2

Change-Id: Ie8b30310a8da64e6247472fa17945d003b1894e8
2017-04-22 00:49:19 +00:00
Dianne Hackborn
83af3eed5d Merge "Address various JobScheduler API feedback." into oc-dev am: e3cc9287ac
am: 626a97618e

Change-Id: I280c45eff7eda9a036c2165b418f7672a5544ad4
2017-04-22 00:47:37 +00:00
Dianne Hackborn
626a97618e Merge "Address various JobScheduler API feedback." into oc-dev
am: e3cc9287ac

Change-Id: I8801bb55abacae1aa2f1cf4d109087dc0209e4cf
2017-04-22 00:39:09 +00:00
Dianne Hackborn
e3cc9287ac Merge "Address various JobScheduler API feedback." into oc-dev 2017-04-22 00:33:47 +00:00
Hugo Benichi
dc54ad7fc3 Merge "NsdManager: add unit tests" 2017-04-22 00:31:28 +00:00
TreeHugger Robot
afe32d2fb1 Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc-dev 2017-04-22 00:17:29 +00:00
Doris Liu
d992335ae6 Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev am: 4d72cd9550
am: ce680bfd06

Change-Id: I07401f285ae1abe18bf3932bf79618759f24c9bd
2017-04-21 23:46:29 +00:00
Adam Lesinski
ea957eb6d2 Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev am: 5be3647a9e
am: 091fe96343

Change-Id: Ib313379b085c4d3ee435b22bb844aeeef6ff74cf
2017-04-21 23:40:31 +00:00
TreeHugger Robot
08c90805b4 Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev 2017-04-21 23:40:28 +00:00
Robert Greenwalt
88a6acb9f6 Merge "Mark Restricted APN connections as restricted." am: b90b2015d3
am: 1778682242

Change-Id: I2300c5e98b8e3339825bfac7ea1f6d514b5ae71f
2017-04-21 23:29:47 +00:00
Doris Liu
ce680bfd06 Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev
am: 4d72cd9550

Change-Id: I37f564cb4b55572dae2a6cf93e2ba4528ddf8a93
2017-04-21 23:23:09 +00:00
Doris Liu
4d72cd9550 Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev 2017-04-21 23:14:34 +00:00
Treehugger Robot
b90b2015d3 Merge "Mark Restricted APN connections as restricted." 2017-04-21 23:12:52 +00:00
Adam Lesinski
091fe96343 Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev
am: 5be3647a9e

Change-Id: Ie0408d44a2641e704c18399c996aff7f996e2764
2017-04-21 22:42:31 +00:00
Stefan Ramsauer
a3ced1c0af Merge "Fix parameter name mismatch in getResourceIdentifier." 2017-04-21 22:37:35 +00:00
Dennis Kempin
7345ed5065 Add PC feature flag
This CL adds a feature flags for traditional clamshell and desktop
computing devices. It can be used by apps to specifically target
those device types (such as Chromebooks) and by the framework to
recognize apps that have been designed for that form-factor.

Bug: 37359238
Test: None
Change-Id: Ie10443583997bcf1bff0b44da31af3f144f7aa0b
2017-04-21 15:37:02 -07:00
TreeHugger Robot
5be3647a9e Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev 2017-04-21 22:35:57 +00:00
Stanley Tng
dd749b0f61 Allow the Bluetooth MAC address to be updated asynchronously (2/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.

Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug: 36709382

Change-Id: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
(cherry picked from commit ad4d1d8e28)
2017-04-21 22:19:57 +00:00
Dianne Hackborn
28d1b66134 Address various JobScheduler API feedback.
- New sample code.
- Fix/improve some docs.
- Hide JobWorkItem Parcl constructor.

Also:

- Add new JobWorkItem API to get the number of times it has been
delivered.
- Do a bit more optimization of checking if a job is ready.

Bug: 37534393  API Review: JobInfo.Builder
Bug: 37544057  API Review: JobServiceEngine
Bug: 37544153  API Review: JobWorkItem

Test: bit CtsJobSchedulerTestCases:*
Change-Id: I66891a038fba752f45dcaed43e615fa9209b71fc
2017-04-21 15:02:10 -07:00
Robert Greenwalt
a7e148a874 Mark Restricted APN connections as restricted.
If anything unrestricted is bundled in the whole thing has to be
unrestricted (we can't restrict based on destination or intent)
but the NOT_METERED flag wasn't taken into account.

This wasn't a problem before because telephony set that statically
and late, but a change caused it to be marked NOT_METERED earlier
which exposed this bug.

bug: 37208956
Merged-In: I7b7a1c38621ce0ecde8cf041e82b1ebb7a9c6f15
Test: new NetworkCapabilitiesTest.  Fails without fix, works with.
Change-Id: I86c1b2854413a94662aa53e697d32380695ab9ac
2017-04-21 22:00:17 +00:00
Seigo Nonaka
cfd5ce408f Merge "Introduce TextView attribute for control justification." into oc-dev am: 31eeb08bdb
am: e7c2e03d22

Change-Id: I276206b9bff862e8147339e77e77faeb1a938f97
2017-04-21 21:58:39 +00:00
Suprabh Shukla
475cb57d80 Merge "Renaming intent action for unknown sources" into oc-dev am: f277ccbca6
am: de8f784bb2

Change-Id: Icaa3dc557f4a63250f22d334f57978e682830ab4
2017-04-21 21:45:24 +00:00
Seigo Nonaka
e7c2e03d22 Merge "Introduce TextView attribute for control justification." into oc-dev
am: 31eeb08bdb

Change-Id: If757a42d277a4a313eafe08196610eb1cebc2bf5
2017-04-21 21:44:24 +00:00
Suprabh Shukla
de8f784bb2 Merge "Renaming intent action for unknown sources" into oc-dev
am: f277ccbca6

Change-Id: I836447e93964519f930e0ab1f9c08cdab406e2d6
2017-04-21 21:31:45 +00:00
TreeHugger Robot
31eeb08bdb Merge "Introduce TextView attribute for control justification." into oc-dev 2017-04-21 21:31:20 +00:00
TreeHugger Robot
f277ccbca6 Merge "Renaming intent action for unknown sources" into oc-dev 2017-04-21 21:22:09 +00:00
Seigo Nonaka
4cbb441425 Introduce TextView attribute for control justification.
Bug: 37447278
Test: am instrument -w -e class android.widget.cts.TextViewTest
      android.widget.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I7946f460ad8a6c2423b464c27225411d155d4d8d
2017-04-21 21:17:58 +00:00
Doris Liu
5fb129c2ab Behavior compat for child being manipulated outside Animatorset
When a child animator is being manipulated outside of the AnimatorSet,
such as when the child animator is running before the AnimatorSet gets
started, we need to make sure we maintain the behavoir on N:
The child animator will be re-started at its scheduled start time in
the AnimatorSet.

BUG: 37507882
Test: Repro steps in comment #1 & ag/2144081/
Change-Id: Ib97e85706f01d18a2e72fb4d1d678e22cf959894
2017-04-21 21:13:52 +00:00
Jakub Pawlowski
0f37b49721 Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am: c8d5f84fcf am: e00b92e550 am: b4be7093da
am: c611b7ae90

Change-Id: I5b4523adc324a49f78d4f5a9309fc01dfcd14d04
2017-04-21 20:56:22 +00:00
Jakub Pawlowski
c611b7ae90 Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am: c8d5f84fcf am: e00b92e550
am: b4be7093da

Change-Id: I712347c5e3ceaae00fd179e77d62311ef6bba89d
2017-04-21 20:50:07 +00:00
Jakub Pawlowski
b4be7093da Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am: c8d5f84fcf
am: e00b92e550

Change-Id: I6805a973e91ac16cfc5d1c30567df04e7ed98ba2
2017-04-21 20:43:55 +00:00
Jakub Pawlowski
76cceb1189 Bluetooth: improve getLeMaximumAdvertisingDataLength comment
Bug: 37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927
(cherry picked from commit 4634b5cd27)
2017-04-21 13:41:37 -07:00
Jeff Sharkey
2d3bdf9201 Merge "Move PackageManager to new auto-doc feature!" into oc-dev am: 0a02259bba
am: 8203c3694a

Change-Id: I4bb0d19647db20e91d06602322fab6914a891d8e
2017-04-21 20:35:24 +00:00
Jakub Pawlowski
4634b5cd27 Bluetooth: improve getLeMaximumAdvertisingDataLength comment
Bug: 37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927
2017-04-21 20:28:39 +00:00
Jeff Sharkey
8203c3694a Merge "Move PackageManager to new auto-doc feature!" into oc-dev
am: 0a02259bba

Change-Id: I10256e0e19e07f0636561a202cd5a5f38a59047f
2017-04-21 20:26:59 +00:00
Adam Lesinski
50954d2b4e Propagate density through AdaptiveIconDrawable and BitmapDrawable
Resources#getDrawableForDensity now propagates the overridden
density through to AdaptiveIconDrawable so that the density can be
propagated to leaf BitmapDrawables correctly.

This enables AdaptiveIconDrawable to support higher resolution
foreground/background bitmaps for use in Launcher.

Bug: 36039665
Test: bit CtsContentTestCases:android.content.res.cts.ResourcesTest
Change-Id: Iaa9a5592626e38e1ff839a76f7c6cfb9e16e5dc1
2017-04-21 13:25:44 -07:00
Jeff Sharkey
d85b1ddaeb Merge "Fix code accounting bugs, track external app data." into oc-dev am: 4b32f7c676
am: 90d020d979

Change-Id: I7988898a2f2404e9af76b95190bd6ad839b85d77
2017-04-21 20:20:33 +00:00