Commit Graph

58894 Commits

Author SHA1 Message Date
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
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
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
Pierre Imai
6b4e15b155 Record the transport types for connectivity events.
BUG: 25691077
Change-Id: I40b6de5446325e717c0356603fd66cd395db9acb
2016-04-14 15:38:17 +09:00
Zhijun He
a19762765d Merge "Camera: clarify lens shading map" into nyc-dev
am: 15aac69

* commit '15aac69c8f16e5edd62fd6557cf6ffb5e04b351e':
  Camera: clarify lens shading map

Change-Id: I403577261078949cb30c0a66390e833108d3b98f
2016-04-14 05:26:18 +00:00
Zhijun He
15aac69c8f Merge "Camera: clarify lens shading map" into nyc-dev 2016-04-14 05:20:45 +00:00
Yuki Awano
b28d871a8d Do not update accessibilityTitle in LayoutParams.setTitle
am: 0697c7a

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

Change-Id: I006620e1ac9c8571dd698f45da75284010dc58e9
2016-04-14 04:21:55 +00:00
Yuki Awano
0697c7a877 Do not update accessibilityTitle in
LayoutParams.setTitle

Bug: 28126629
Change-Id: Idfd8c0210d32e1a0e9c16272cfbb35ef6065e805
2016-04-14 04:16:18 +00:00
Erik Kline
48f8f2951b Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev
am: f824e58

* commit 'f824e58d493bb86789bcb8de27a2e43a762c5d3e':
  Add some more metrics: IpManager, IpReachabilityMonitor

Change-Id: Icc62c058b26a8b31f3651569371dbb231cef4502
2016-04-14 03:27:17 +00:00
Erik Kline
5b25a0f796 Add some more metrics: IpManager, IpReachabilityMonitor
Change-Id: Ibb7150c849715a42fc2c879589eaaf86e8a007e7
2016-04-14 10:53:30 +09:00
Steven Dao
f917e2f738 Merge "Populate RangeInfo correctly when acquiring from pool" into nyc-dev
am: c1699a9

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

Change-Id: I0227f6b9a842fa1e63827cda51e0cb5a435e278e
2016-04-14 00:34:13 +00:00
TreeHugger Robot
c1699a9f4c Merge "Populate RangeInfo correctly when acquiring from pool" into nyc-dev 2016-04-14 00:28:28 +00:00
Dianne Hackborn
034b58c2f5 Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev
am: 9e31b3f

* commit '9e31b3fd817aed28d9afd712fa49ec9d6fc11329':
  More work on issue #26390151: Add new JobScheduler API...

Change-Id: I7c227898d175c15219192fc42c5e4eb5121e9517
2016-04-13 23:37:31 +00:00
Dianne Hackborn
9e31b3fd81 Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev 2016-04-13 23:30:14 +00:00
Doris Liu
db976a28c4 Merge "Add api check to guard AnimatorSet behavior change" into nyc-dev am: c5801fb
am: f4b5a9d

* commit 'f4b5a9d7f6c56198bcbdceed52e077df62c37be7':
  Add api check to guard AnimatorSet behavior change

Change-Id: I020000d1f7fc90e25ecef91470dc599e417b4a4e
2016-04-13 23:26:58 +00:00
Junda Liu
aaa2251da0 Merge "Add toString to CarrierIdentifier." into nyc-dev am: 71f69a7
am: ea15981

* commit 'ea1598173a82d1f139b0e192c38f8c28d751dcbd':
  Add toString to CarrierIdentifier.

Change-Id: I5aca439c4924a23ed0303e257d5a330b3f4dfb7c
2016-04-13 23:26:55 +00:00
Doris Liu
f59107185b Merge "Skip to end for 0-duration animation" into nyc-dev am: 1dfe35b
am: 677b2c6

* commit '677b2c60aa5bd41b856762d223161220476844bb':
  Skip to end for 0-duration animation

Change-Id: Ibc359887f4d96a84742e4369bb0059c1ece1afc1
2016-04-13 23:19:46 +00:00
Doris Liu
f4b5a9d7f6 Merge "Add api check to guard AnimatorSet behavior change" into nyc-dev
am: c5801fb

* commit 'c5801fb9333823f08889f82eb4679638d18d6863':
  Add api check to guard AnimatorSet behavior change

Change-Id: If3d6417d60c70161869e41aa94f89e2afee9bd33
2016-04-13 23:19:43 +00:00
Jonathan Basseri
ea1598173a Merge "Add toString to CarrierIdentifier." into nyc-dev
am: 71f69a7

* commit '71f69a71ffd77367a53721fcaed015cba942f5c3':
  Add toString to CarrierIdentifier.

Change-Id: I1b0d7e0d117b0aa10482ec0ddc52a4531e570b70
2016-04-13 23:19:41 +00:00
Doris Liu
c5801fb933 Merge "Add api check to guard AnimatorSet behavior change" into nyc-dev 2016-04-13 23:15:33 +00:00