Commit Graph

58914 Commits

Author SHA1 Message Date
John Reck
a749cfa88f Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev am: d6a25c2
am: fe16c4b

* commit 'fe16c4b105c34f451b4b100c970e1711e793dfe1':
  Revert "Revert "Make stopped state a first-class thing""

Change-Id: I5bd0dd197e2b33d852b48545a24cbf43670a3e4c
2016-04-14 19:37:04 +00:00
Chris Craik
3f379c9d66 Merge "Destroy drawing cache when switching layer type" into nyc-dev am: 2344c6a
am: 8c743b0

* commit '8c743b0ee979b9c56e595f78f2ddfba8970888be':
  Destroy drawing cache when switching layer type

Change-Id: I766d3827aec82871730f9663fdd7ae3b00527be4
2016-04-14 19:35:10 +00:00
Alan Viverette
0d877b81d2 Merge "Update day of week labels when setting month params in SimpleMonthView" into nyc-dev am: d51afa4
am: d2bead3

* commit 'd2bead39e43eafff9b067640416d916c2672b174':
  Update day of week labels when setting month params in SimpleMonthView

Change-Id: Ie167fc1b59aa2cf7726bf1541b3d003318dd3ba6
2016-04-14 19:34:37 +00:00
Rob Carr
d4561e3974 Merge "Add WindowManager side timeout for toasts." into nyc-dev am: b33daec
am: 6d94ed1

* commit '6d94ed11db50c7988d63badb0451753a32512a77':
  Add WindowManager side timeout for toasts.

Change-Id: I37d0958941c768c088d21170449c2e218c6c2b0e
2016-04-14 19:34:10 +00:00
TreeHugger Robot
cec5ba16e6 Merge "API Review: Improve javadoc of EXTRA_REMOTE_INPUT" into nyc-dev am: 82676d9
am: 554ffad

* commit '554ffadfb9bc01673928e86f336ec504836ba263':
  API Review: Improve javadoc of EXTRA_REMOTE_INPUT

Change-Id: Ic71944496906b6c9739297459a1ec127f9b47101
2016-04-14 19:31:22 +00:00
Daniel Sandler
aefdfa5721 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev am: 3af45bd
am: 73a694b

* commit '73a694b486b8b37d7e61e5ad53b3c9b139b783e9':
  Allow system apps to substitute a different app name in notifications.

Change-Id: Id47615712e65e8a11edd68dcd729824c9c37c85a
2016-04-14 19:29:49 +00:00
Gustav Sennton
35562f764b Verify WebView package info before loading WebView am: cd8f273
am: 9e5a257

* commit '9e5a25702d1d00864b94915944af68d9b92712ef':
  Verify WebView package info before loading WebView

Change-Id: I18d87f83b46366169d6c6dbd9a1b7225e3d1a173
2016-04-14 19:29:22 +00:00
Niels Egberts
4f5fa52151 Merge "Fix issue when QUEUE_DESTROY arrive at the same time." into nyc-dev am: e767e1b
am: 3feb21c

* commit '3feb21c44ff82c4ddac7777246dc1b68fe52b6a0':
  Fix issue when QUEUE_DESTROY arrive at the same time.

Change-Id: I445c2697a87f87182e57fc77537932a536b80ed3
2016-04-14 19:28:53 +00:00
TreeHugger Robot
ceac5dd9de Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev am: 0628d32
am: 886d17c

* commit '886d17c035805cef3bce3d2d96e53ba48bf5b62b':
  Also log IPv4 and IPv6 connectivity of any previous default network

Change-Id: I8c82f1058531d1f5a0cdb73314b8fd742dae7860
2016-04-14 19:26:50 +00:00
Clara Bayarri
7b02468b34 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev am: 6e58549
am: bdcd8dc

* commit 'bdcd8dce23ad83a696fc350374abde50ee91c6d0':
  Provide startIntentSenderForResult for fragments

Change-Id: I5746132388eabcf5e29a948cb36d30745ae73887
2016-04-14 19:26:09 +00:00
Bernard Chau
60b73587bb Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev am: 25c43b7
am: d17b301

* commit 'd17b3013ce7bd38aaf16d1ffd578d964bfd1808a':
  Includes both direct boot aware and unaware apps in Apps default view

Change-Id: I85630c13799c9bbaa558a0f1582691f7a00e0b86
2016-04-14 18:52:53 +00:00
Hugo Benichi
018a9d3127 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev am: fc18b6f
am: 39de1e2

* commit '39de1e2de51f4c0789904abb1623c8b7d648411e':
  Add DHCP error event class and record DHCP errors.

Change-Id: I8262883d6178be380265cf35497782f35dab043c
2016-04-14 18:52:01 +00:00
Pierre Imai
87421a21c7 Merge changes Ia71865a9,I40b6de54 into nyc-dev am: 1feca76
am: f8ef3c3

* commit 'f8ef3c36a97b68b5e27127681973244f481cca09':
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.

Change-Id: If019f2c448ed3411a0b23dfdd6038e1b9fe2099d
2016-04-14 18:51:38 +00:00
Zhijun He
497280cac9 Merge "Camera: clarify lens shading map" into nyc-dev am: 15aac69
am: a197627

* commit 'a19762765d099acf9cd81105343f857b8845788d':
  Camera: clarify lens shading map

Change-Id: I8adc602a08dbb5521f57319fd2a80bffb305ef82
2016-04-14 18:49:55 +00:00
Yuki Awano
2a68999d4f Do not update accessibilityTitle in LayoutParams.setTitle am: 0697c7a
am: b28d871

* commit 'b28d871a8dc1ae3f78ac6587272f8c8454718188':
  Do not update accessibilityTitle in LayoutParams.setTitle

Change-Id: Ie6ce4e042ea3a14e7ed66dad89f4d879e128869b
2016-04-14 18:48:54 +00:00
TreeHugger Robot
b03419e212 Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev am: f824e58
am: 48f8f29

* commit '48f8f2951bf54dcf998916e915e150f782088c71':
  Add some more metrics: IpManager, IpReachabilityMonitor

Change-Id: Idda93d8b3c1b3d6a12d3958627fb291f647b18dd
2016-04-14 18:45:53 +00:00
TreeHugger Robot
382987244e Merge "Populate RangeInfo correctly when acquiring from pool" into nyc-dev am: c1699a9
am: f917e2f

* commit 'f917e2f738f25bcf34ffa073008e872d803458e1':
  Populate RangeInfo correctly when acquiring from pool

Change-Id: I4273c7fe4511b8a542f15b604387e6f27ee6d676
2016-04-14 18:36:38 +00:00
John Reck
fe16c4b105 Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev
am: d6a25c2

* commit 'd6a25c2b3e7fd5a98741e2f770cf54d539b29258':
  Revert "Revert "Make stopped state a first-class thing""

Change-Id: Iff85c259e93a54c3e3a9db3f3d2b2f826526de0a
2016-04-14 17:47:40 +00:00
John Reck
d6a25c2b3e Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev 2016-04-14 17:40:52 +00:00
John Reck
8afcc76920 Revert "Revert "Make stopped state a first-class thing""
This reverts commit eab3f2658a.

Fixes first-frame issue, mReportNextDraw needs to override
mStopped

Fixes: 28118961
Fixes: 27286867

Change-Id: I5c811759637d08ba9f3b342016d1b3006986d5a2
2016-04-14 10:39:03 -07:00
Joe Onorato
075bb7e3f4 Merge commit '034b58c2f53a9101395b2cd8cd4e01be9f93c2b2' into manual_merge_034b58c
More work on issue #26390151: Add new JobScheduler API...

...for monitoring content providers

We now have some delays before reporting URI changes, to allow
them to batch together.

Also clean up debug output, and fix some issues with how we
were managing the content observer state.

And while I am here, fix the device idle and app idle controllers
to no longer maintain their own list of jobs, but just directly
iterate over the JobStore.

Change-Id: I709bd7c77e1b5ffb012e36149a739ecb245dd5cd
2016-04-14 10:27:31 -07:00
Chris Craik
8c743b0ee9 Merge "Destroy drawing cache when switching layer type" into nyc-dev
am: 2344c6a

* commit '2344c6a2ae0d6ccd650a13aaedb403fa7e3ea579':
  Destroy drawing cache when switching layer type

Change-Id: I6b455a94c9fa8219201cc32099493fecf82afafc
2016-04-14 17:12:02 +00:00
Chris Craik
2344c6a2ae Merge "Destroy drawing cache when switching layer type" into nyc-dev 2016-04-14 17:07:35 +00:00
Alan Viverette
d2bead39e4 Merge "Update day of week labels when setting month params in SimpleMonthView" into nyc-dev
am: d51afa4

* commit 'd51afa4525659658b9dbce381761e37a9b931d55':
  Update day of week labels when setting month params in SimpleMonthView

Change-Id: I5f0d84e29b69ecbb2b0a86d7859bb614baddc4c0
2016-04-14 16:50:25 +00:00
Robert Carr
6d94ed11db Merge "Add WindowManager side timeout for toasts." into nyc-dev
am: b33daec

* commit 'b33daec8c2e9e12cdb9c7e5db388656fd8aff98f':
  Add WindowManager side timeout for toasts.

Change-Id: I95c5eae99da60c47a1986bab07f6b2fe4f550327
2016-04-14 16:50:23 +00:00
Alan Viverette
d51afa4525 Merge "Update day of week labels when setting month params in SimpleMonthView" into nyc-dev 2016-04-14 16:27:34 +00:00
Rob Carr
b33daec8c2 Merge "Add WindowManager side timeout for toasts." into nyc-dev 2016-04-14 16:23:24 +00:00
Adrian Roos
554ffadfb9 Merge "API Review: Improve javadoc of EXTRA_REMOTE_INPUT" into nyc-dev
am: 82676d9

* commit '82676d9f8810f4ab3e943e89df135cc87857f537':
  API Review: Improve javadoc of EXTRA_REMOTE_INPUT

Change-Id: Ic9c091ae358bd55b2d8d4f7ffbb688028cb2cc30
2016-04-14 14:49:45 +00:00
TreeHugger Robot
82676d9f88 Merge "API Review: Improve javadoc of EXTRA_REMOTE_INPUT" into nyc-dev 2016-04-14 14:45:00 +00:00
Alan Viverette
08dbbcdc9b Update day of week labels when setting month params in SimpleMonthView
Bug: 27310206
Change-Id: I40c09fb5dddb202a17ac9c6ecee1d6f40644d9e6
2016-04-14 10:15:04 -04:00
Dan Sandler
73a694b486 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev
am: 3af45bd

* commit '3af45bd2d06303bfaf8ba28324ca976e6f96ece3':
  Allow system apps to substitute a different app name in notifications.

Change-Id: I5fc24757a4db46a499f5638c04922e131c79d1f9
2016-04-14 13:59:20 +00:00
Gustav Sennton
9e5a25702d Verify WebView package info before loading WebView
am: cd8f273

* commit 'cd8f2737cc550ef1461c74a5c748777fa0c97379':
  Verify WebView package info before loading WebView

Change-Id: I75b306ddc59ace1a5d6613a0fbdb0c8c801333c2
2016-04-14 13:59:17 +00:00
Daniel Sandler
3af45bd2d0 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev 2016-04-14 13:53:19 +00:00
Dan Sandler
732bd6cb27 Allow system apps to substitute a different app name in notifications.
This is a privileged permission and is only to be used by
the core OS and related packages whose names are confusing
or misleading when shown in notifications.

The user will always be able to see the true package name by
accessing the notification inspector (longpress or swipe
gesture on the notification row in SystemUI).

Fixes: 26517701
Change-Id: I2b021c9da0757b99df76399666af263668d88070
2016-04-14 13:48:03 +00:00
Gustav Sennton
cd8f2737cc Verify WebView package info before loading WebView
To ensure that the package we are using to load WebView is a valid
provider we need to verify this before loading WebView - not only when
choosing what package to use.

Bug: 27900925
Change-Id: If57ca32a7a3fa08735a3b8ea9ed268c1bb1b8ede
2016-04-14 14:19:07 +01:00
Kirill Grouchnikov
698b751dc7 Add @TestApi-guarded way to get bounds of specific day in CalendarView
Two separate implementation paths, one for Material look / layout, and
one for legacy / pre-Material one.

Bug: 28037149
Change-Id: Id1946802c0a93218d9eb0b73c81ad76dc027763c
2016-04-14 08:47:05 -04:00
Niels Egberts
3feb21c44f Merge "Fix issue when QUEUE_DESTROY arrive at the same time." into nyc-dev
am: e767e1b

* commit 'e767e1bc17eeb4302ef503bcc83ed8697db91433':
  Fix issue when QUEUE_DESTROY arrive at the same time.

Change-Id: Ic1d42d8b74ec27be4a3d57c3df8c221d5907c739
2016-04-14 12:39:21 +00:00
Niels Egberts
e767e1bc17 Merge "Fix issue when QUEUE_DESTROY arrive at the same time." into nyc-dev 2016-04-14 12:33:05 +00:00
Erik Kline
886d17c035 Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev
am: 0628d32

* commit '0628d324d0f1c2116c051faadd8e4bf26206b1a6':
  Also log IPv4 and IPv6 connectivity of any previous default network

Change-Id: Ibcbd79a6674cf062138ccbd031d14721b0367e22
2016-04-14 10:20:17 +00:00
TreeHugger Robot
0628d324d0 Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev 2016-04-14 10:14:20 +00:00
Clara Bayarri
bdcd8dce23 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev
am: 6e58549

* commit '6e5854974098e4e2f734510e7dd8221a324f34ad':
  Provide startIntentSenderForResult for fragments

Change-Id: I363540141afa80476fe0db79103c0df08794a5ae
2016-04-14 10:11:15 +00:00
Clara Bayarri
6e58549740 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev 2016-04-14 10:05:35 +00:00
Bernard Chau
d17b3013ce Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev
am: 25c43b7

* commit '25c43b78d11f74e98ba9d5f541647aa5ed44ebce':
  Includes both direct boot aware and unaware apps in Apps default view

Change-Id: I23eeef915a4607aa387e826056056cb7632a4542
2016-04-14 09:45:55 +00:00
Bernard Chau
25c43b78d1 Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev 2016-04-14 09:40:00 +00:00
Erik Kline
48f12f2ad6 Also log IPv4 and IPv6 connectivity of any previous default network
Change-Id: I07595c0a131fea21914f524949cd64af87403b88
2016-04-14 17:54:46 +09:00
Hugo Benichi
39de1e2de5 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev
am: fc18b6f

* commit 'fc18b6f3608d87f3dc53cda8d8db30636c92d6e9':
  Add DHCP error event class and record DHCP errors.

Change-Id: I5b9ef8b191ab0ef4349ed00c1d8f548393aba368
2016-04-14 08:08:54 +00:00
Hugo Benichi
fc18b6f360 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev 2016-04-14 08:01:31 +00:00
Pierre Imai
f8ef3c36a9 Merge changes Ia71865a9,I40b6de54 into nyc-dev
am: 1feca76

* commit '1feca76bd48008aa3421c8741cb147ecc1a6e912':
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.

Change-Id: I2aea598dd2926c18fdb4e6301759539c504038dc
2016-04-14 07:31:38 +00:00
Pierre Imai
1feca76bd4 Merge changes Ia71865a9,I40b6de54 into nyc-dev
* changes:
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.
2016-04-14 07:25:34 +00:00
Hugo Benichi
6241874355 Add DHCP error event class and record DHCP errors.
This patch adds an event class derived from IpConnectivityEvent that
records parsing errors of DHCP response packets.

Change-Id: I19516cf05e3419c4262e3236899e52987e5f2264
2016-04-14 15:40:10 +09:00