Commit Graph

62103 Commits

Author SHA1 Message Date
Roozbeh Pournader
875446698c Merge "Get failing WordIterator unit tests to pass again" 2016-06-29 22:03:29 +00:00
Daniel Nishi
f06f1b8180 Merge \\"Use the Deletion Helper when system storage is low.\\" into nyc-mr1-dev am: 6401217532
am: b8a7ddad7e

Change-Id: I3d51bb6934e4a42ec8e9d7f37d460b780a5941fe
2016-06-29 21:54:10 +00:00
Daniel Nishi
b8a7ddad7e Merge \"Use the Deletion Helper when system storage is low.\" into nyc-mr1-dev
am: 6401217532

Change-Id: I9d8645a32185a8749edeeee654ee81bdd00f240f
2016-06-29 21:47:05 +00:00
Daniel Nishi
6401217532 Merge "Use the Deletion Helper when system storage is low." into nyc-mr1-dev 2016-06-29 21:37:07 +00:00
Dianne Hackborn
4aba72c6c8 Merge \\\"Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API\\\" into nyc-dev am: 205bc262ce am: 381f4eb9be
am: d229fdb1c7

Change-Id: Idc70c2c5893ac586cc192ea75fe04fdab421e851
2016-06-29 21:34:02 +00:00
Dianne Hackborn
d229fdb1c7 Merge \\"Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API\\" into nyc-dev am: 205bc262ce
am: 381f4eb9be

Change-Id: I5cc4b41990cdf389e6e55f6891a87a9030a6d218
2016-06-29 20:51:33 +00:00
Dianne Hackborn
50beee8af9 Merge \"Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API\" into nyc-dev
am: 205bc262ce

Change-Id: I3d7186834028be519b512fbcb2240d2ff692f564
2016-06-29 20:50:52 +00:00
Dianne Hackborn
381f4eb9be Merge \"Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API\" into nyc-dev
am: 205bc262ce

Change-Id: I910f4db4503ad20ecce46032691001d1f971bdbf
2016-06-29 20:45:36 +00:00
Alan Viverette
9d2328e57c Merge \"Remove framework dependencies on Support* demos\" into nyc-mr1-dev
am: c295a4b23d

Change-Id: Icd4eac0fafdae01d95910dc084787350168a8688
2016-06-29 20:34:47 +00:00
TreeHugger Robot
c295a4b23d Merge "Remove framework dependencies on Support* demos" into nyc-mr1-dev 2016-06-29 20:31:03 +00:00
Roozbeh Pournader
9dad5811d7 Get failing WordIterator unit tests to pass again
WordIterator is now following the pattern in java.text.BreakIterator,
throwing an IllegalArgumentException when receiving an invalid argument.
Previously, it failed inconsistently.

Also add @SmallTest annotations to the WordIterator tests.

Bug: 29868991
Change-Id: I8158f2f419c8c4467205031655c0e62cc9ef5c1c
2016-06-29 13:14:13 -07:00
Sanket Agarwal
40bb6f3f8f Use UUIDs for call management in Headset Client (HF)
Using UUIDs that are managed by the service gives more control and error
handling in the service since it has control over assigning them.

Bug: b/29788044
Change-Id: I8483f8e61a33302ba95d544828947d7fb4a21be9
(cherry picked from commit dbeab2c6e12693fe9b06b6a680677da5325c9230)
2016-06-29 18:58:09 +00:00
Dianne Hackborn
1150b735c8 Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
Change-Id: I0034b1681158b9a010d01fb0fcbe7990d9038c1f
2016-06-29 11:49:01 -07:00
Derek Sollenberger
c63d24868c Merge "Remove isAvailable() from DisplayListCanvas." 2016-06-29 17:15:14 +00:00
Amith Yamasani
96c0bc2eb9 Merge \\"An API to check if running in a demo user\\" into nyc-mr1-dev am: b71081e4e9
am: b61a5f1d64

Change-Id: I3e4e57997ecf942d0607628529f0bf97f4c1d2ce
2016-06-29 15:29:22 +00:00
Amith Yamasani
b61a5f1d64 Merge \"An API to check if running in a demo user\" into nyc-mr1-dev
am: b71081e4e9

Change-Id: Ie4e01ae963a86346acbc81d2ca5824ddefef8d20
2016-06-29 15:24:06 +00:00
Amith Yamasani
b71081e4e9 Merge "An API to check if running in a demo user" into nyc-mr1-dev 2016-06-29 15:18:34 +00:00
Derek Sollenberger
f64c34e73f Remove isAvailable() from DisplayListCanvas.
The method has been moved to ThreadedRenderer and the native
implementation has been renamed to better reflect its intent.

Change-Id: I7ee6d578ad0c2ee20111edd424c7560a449f0b39
2016-06-29 08:25:06 -04:00
Hugo Benichi
186e5b57d3 Refactor IP connectivity event logging am: cfddd68792
am: 17427c9770

Change-Id: If8775031f2a293e94e564dde502d0775d5808fe6
2016-06-29 07:23:19 +00:00
Hugo Benichi
17427c9770 Refactor IP connectivity event logging
am: cfddd68792

Change-Id: I8de880edc4a8c7f12527218788cb44f263acb56f
2016-06-29 07:18:28 +00:00
Hugo Benichi
cfddd68792 Refactor IP connectivity event logging
This patch removes static methods for logging IP connectivity events
defined in android.net.metrics and replaces them with a single log()
instance method defined on IpConnectivityLog. Event constructors are
now public also. Every classes logging such events now create an
instance of IpConnectivityLog for logging event objects directly
instantiated with new.

Removing static dependencies allow straightforward testing of logging.

This patch also removes the base IpConnectivityEvent class which is not
needed any more.

Bug: 29035129
Change-Id: I3de700f93f46deaa48a759f938f7d00e1d8bff98
2016-06-29 14:28:51 +09:00
Siyamed Sinir
24ae4b6d1b Merge "Fix bidi desired width calculation" 2016-06-29 01:42:34 +00:00
Hugo Benichi
21b6b821df Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev am: 41a3acc55a
am: ca9a575a79

Change-Id: I948403eb8ff92b2de87d8ce402921b3ede7e0b82
2016-06-29 00:30:17 +00:00
Hugo Benichi
ca9a575a79 Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev
am: 41a3acc55a

Change-Id: I393032c574d5820b37e3a2bbfb412b7bc45d97f2
2016-06-29 00:25:13 +00:00
Hugo Benichi
41a3acc55a Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev
* changes:
  Add tests for MetricsLoggerService
  Tests for IpConnectivityMetricsLog
2016-06-29 00:15:49 +00:00
Amith Yamasani
1c41dc8ec5 An API to check if running in a demo user
Add an API to query if the calling app is running
in a demo user sandbox. This allows apps to customize
the starting experience to a potential customer.

Change-Id: I50e40f9a8c66da4b5672c1dc64606d7bedba3f8c
Fixes: 29833923
2016-06-28 17:05:19 -07:00
Stan Iliev
74eb64d37f Merge "Fix wording regarding ThreadedRenderer" 2016-06-28 22:12:31 +00:00
Siyamed Sinir
79bf9d19f2 Fix bidi desired width calculation
Layout.getDesiredWidth measured text with TextDirectionHeuristics.LTR,
whereas the real calculations used the active direction heuristic set
in the TextView instance. This CL uses the same heuristics for both of
them by passing the value to Layout.getDesiredWidth function.

Bug: 28845953
Change-Id: I68d23f55fe5a86255d62e83bc62df38a047e4bca
2016-06-28 14:01:18 -07:00
Felipe Leme
34cc5c0e48 Merge \\"Merge \\\"Remove redundant setPendingIntentWhitelistDuration() calls.\\\" into nyc-dev am: c1374208e3\\" into nyc-mr1-dev am: b1400b142e
am: 62e46e8899

Change-Id: Id8aed75038fed88c8c11a1d953726712b7005c62
2016-06-28 20:59:55 +00:00
Todd Kennedy
71e4da01a6 Merge \\"Define deprecated fields in IntDef\\'s\\" into nyc-mr1-dev am: 23bc74a8d5
am: c3575b2149

Change-Id: Ic1d2ac7e3cdb06ce1b01661dac1981aafc05b260
2016-06-28 20:59:47 +00:00
Felipe Leme
62e46e8899 Merge \"Merge \\"Remove redundant setPendingIntentWhitelistDuration() calls.\\" into nyc-dev am: c1374208e3\" into nyc-mr1-dev
am: b1400b142e

Change-Id: I72cddf720ef8f3efd58ebbe79a2aa3e66a85c95a
2016-06-28 20:53:43 +00:00
Todd Kennedy
c3575b2149 Merge \"Define deprecated fields in IntDef\'s\" into nyc-mr1-dev
am: 23bc74a8d5

Change-Id: Ic8648d5acff4afdb65074eb9313be082482e2b17
2016-06-28 20:53:40 +00:00
Android Build Merger (Role)
b1400b142e Merge "Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev am: c1374208e3" into nyc-mr1-dev 2016-06-28 20:49:14 +00:00
Felipe Leme
2f285643bf Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev
am: c1374208e3

Change-Id: Iae3e7fb2ff674046422cc77f10761c8543cd83c5
2016-06-28 20:48:51 +00:00
Felipe Leme
1cec26c69e Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev
am: c1374208e3

Change-Id: Ie02a847ac513f89c1c430af0e3f559cf0bc2039d
2016-06-28 20:48:51 +00:00
TreeHugger Robot
23bc74a8d5 Merge "Define deprecated fields in IntDef's" into nyc-mr1-dev 2016-06-28 20:48:37 +00:00
TreeHugger Robot
c1374208e3 Merge "Remove redundant setPendingIntentWhitelistDuration() calls." into nyc-dev 2016-06-28 20:45:40 +00:00
Stan Iliev
45faba516e Fix wording regarding ThreadedRenderer
ThreadedRenderer is not synonymous with hardware rendering, so
remove references to hardware rendering when referring to
ThreadedRenderer.

Change-Id: Ic66a482ccf05f556ebe6ec194ce4f858f75bbb8b
2016-06-28 16:40:05 -04:00
Kirill Grouchnikov
1c6e6dcfd7 Merge "Fix RemoteViews Javadocs for a couple of methods." 2016-06-28 20:35:35 +00:00
Kirill Grouchnikov
c5b30108bb Fix RemoteViews Javadocs for a couple of methods.
Change-Id: Ie87003bcb0d0c43185e5482e91faee84a798aaee
2016-06-28 15:34:13 -04:00
Todd Kennedy
e6c821a812 Merge \\\"Default minSdkVersion to \\\'1\\\'\\\" into nyc-dev am: a98e3e3ede am: a1066ed6c2
am: e3cc3d8ad4

Change-Id: I42b6c96d661f4f8b3036513303f319c010c00485
2016-06-28 19:27:33 +00:00
Alan Viverette
3c5a1c8124 Remove framework dependencies on Support* demos
Required on nyc-mr1-dev since support library branch was reset.

Change-Id: I5b3ba0e7a17ee5ccd93e97b3bd9c519cb8641d97
(cherry picked from commit 80bf1f8a3c)
2016-06-28 19:26:36 +00:00
Todd Kennedy
e3cc3d8ad4 Merge \\"Default minSdkVersion to \\'1\\'\\" into nyc-dev am: a98e3e3ede
am: a1066ed6c2

Change-Id: I58d97cd42bc939a91d00bd6189a1c2ffcc913b37
2016-06-28 19:22:25 +00:00
Todd Kennedy
a1066ed6c2 Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am: a98e3e3ede

Change-Id: I8d2b7205f80b3cae5dce04839890df6aafa8449e
2016-06-28 19:16:40 +00:00
Todd Kennedy
08739a2778 Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am: a98e3e3ede

Change-Id: Ib3d99a331f49c2e8af2fcda24149314fc939f4c0
2016-06-28 19:16:35 +00:00
Todd Kennedy
1f397f4e7b Define deprecated fields in IntDef's
Tools need all of the valid constants to handle legacy apps; even
though we want developers to use the new constant names.

Bug: 29824931
Change-Id: I5f8055d50d1d3f32cfbed7459d8a497cfbd3661e
2016-06-28 12:14:11 -07:00
Felipe Leme
dd85da6e94 Remove redundant setPendingIntentWhitelistDuration() calls.
Since all pending intents are stored on a Set in the Notication object,
there is no need to individually check for specific pending intents.

BUG: 29480440
Change-Id: I27a18bb535a9a4bb6cb4e76bdc189e6c315a684a
2016-06-28 11:34:54 -07:00
Todd Kennedy
4f6570878c Default minSdkVersion to '1'
Exception when targetSdkVersion is a letter API [eg 'N']. While this
is technically not according to the external docs, it's the behaviour
with prior platforms.

Bug: 29817839
Change-Id: I8382909dbe62de7b2ddfb7995ce11d5c2f43372e
2016-06-28 10:31:05 -07:00
Kirill Grouchnikov
55ec63ec33 Merge "Fix a typo in Javadocs" 2016-06-28 15:57:43 +00:00
Chris Banes
612390dce6 Merge "Make Toolbar ignore its minHeight if larger than height" 2016-06-28 15:52:55 +00:00