Commit Graph

246497 Commits

Author SHA1 Message Date
Scott Main
2d22afc3a1 Merge "resolve merge conflicts of 886bbdb to nyc-dev" into nyc-dev 2016-04-27 01:11:20 +00:00
Tomasz Mikolajewski
b56bc29657 Merge "Exclude virtual files from ACTION_SEND." into nyc-dev 2016-04-27 01:11:04 +00:00
smain@google.com
fce137748a resolve merge conflicts of 886bbdb to nyc-dev
Change-Id: Ib6a009d086ff9f4c3a568124170cd6203f1b385b
2016-04-26 18:09:06 -07:00
Chong Zhang
08eb8a1aa2 Merge "Finish immediately if the resumed activity is already visible" into nyc-dev 2016-04-27 01:08:17 +00:00
Todd Kennedy
c6a51d7f3e Merge "Don\'t override pre-release target sdk" into nyc-dev
am: 97ef0e7

* commit '97ef0e77afa3be6255b70c8567843ac298386251':
  Don't override pre-release target sdk

Change-Id: I59519454c9304b37404da00044f833a8fe6e7890
2016-04-27 00:58:45 +00:00
Robert Carr
63b38d84b9 Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev
am: 69a6fe3

* commit '69a6fe321c7b3934ee8849d2038a85443011050c':
  Fix bugs with takeSurface and preserveWindows.

Change-Id: I4349a4c56bf64da100a4d054a84903b2143ccf82
2016-04-27 00:54:55 +00:00
TreeHugger Robot
97ef0e77af Merge "Don't override pre-release target sdk" into nyc-dev 2016-04-27 00:53:19 +00:00
Hangyu Kuang
9186c38fce media: Change VP9 ProfileLevel to start from 0x1.
Bug:28380207
Related to Bug: 25684127

Change-Id: I9f18358744e9406b34dc880e6eb533945eabe104
2016-04-26 17:51:59 -07:00
Jeff Tinker
d12b7c0600 Remove MediaDrm stack from mediaserver
Part of media security hardening

MediaDrm was temporarily allowed to
run in either mediaserver or mediadrmserver
while all nexus devices were implementing
support for the native_handle representation
of secure buffers.  Now that all nexus
devices support native_handle, the MediaDrm
stack can be removed from mediaserver.

b/22990512

Change-Id: I96a5222f94cd1580ac411de5b48beb44b99cc8d7
2016-04-27 00:49:15 +00:00
Rob Carr
69a6fe321c Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev 2016-04-27 00:47:59 +00:00
Adarsh Fernando
d91c026220 Merge "Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am: e60e315 am: f2a8f83 am: 86eb9f3" into nyc-dev
am: 7f17d27

* commit '7f17d27e8922382c32f53924f59842714da03729':
  Docs: Minor edit to IR docs to mention longer intial/clean builds

Change-Id: I5f7ce51899f7e462ac088629f61e06927275c1d8
2016-04-27 00:47:51 +00:00
Jeff Sharkey
51f2e46690 Merge "Fix two multi-user bugs in package upgrade." into nyc-dev
am: fc5f6e6

* commit 'fc5f6e6c80954c837a98d963789f6a30f3b87ad1':
  Fix two multi-user bugs in package upgrade.

Change-Id: Icf3ad9c02c50f30f40c3772bdded2fb295fade74
2016-04-27 00:47:48 +00:00
Android Build Merger (Role)
7f17d27e89 Merge "Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am: e60e315 am: f2a8f83 am: 86eb9f3" into nyc-dev 2016-04-27 00:43:24 +00:00
Robert Carr
b80d781f1d Clear opaque flag when surface insets change.
In addition to the pixel format there is an extra
force opaque flag. We only update this on creation,
but we need to respond to changing SurfaceInsets forcing
an otherwise opaque surface to become translucent.

Bug: 27364161
Change-Id: I13c69d1271412a0bc71e936867c58d5c413ab56b
2016-04-26 17:42:42 -07:00
Adarsh Fernando
52c591d1b7 Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am: e60e315 am: f2a8f83
am: 86eb9f3

* commit '86eb9f3770faf3fbae439d583db31a5055a06625':
  Docs: Minor edit to IR docs to mention longer intial/clean builds

Change-Id: I52767d1d4a5b0421611056747f0f8bb41c548ae7
2016-04-27 00:40:09 +00:00
TreeHugger Robot
fc5f6e6c80 Merge "Fix two multi-user bugs in package upgrade." into nyc-dev 2016-04-27 00:39:42 +00:00
Kenji Sugimoto
5747c31f26 Merge "Set installed flag of all users if system app is installed later" into nyc-dev
am: e542e0c

* commit 'e542e0cb9b2fbde1cfa7ff36af9cd370af459a49':
  Set installed flag of all users if system app is installed later

Change-Id: I611a1df2f97537019e66d1b756ae8c4dee57171d
2016-04-27 00:36:21 +00:00
Tomasz Mikolajewski
12898987f0 Merge "Fix index computation for quick viewing." into nyc-dev
am: 52036c7

* commit '52036c743c1fccf004247af35e9c95e12fb0a638':
  Fix index computation for quick viewing.

Change-Id: Ief946fe886f8a172cd9e75c0e59904293f0335e2
2016-04-27 00:36:19 +00:00
Robert Carr
2cdecc377f Merge "Touch region fixes for dialogs and overlapping tasks." into nyc-dev
am: 4f40766

* commit '4f40766360fd9f2459e9fc4d30119bec95c2cf48':
  Touch region fixes for dialogs and overlapping tasks.

Change-Id: Id9f08ac6bd213317ddfa229fd2d3a3bf105976c9
2016-04-27 00:36:18 +00:00
Cheryl Potter
b49856af5a resolve merge conflicts of 946609b to nyc-dev
am: 49d7803

* commit '49d7803f046e8e71a473ff1a096ab1e1d6969bcc':
  docs: AVD Manager docs for AS 2.0 b/26907919

Change-Id: Ib5c2b342783ec9ab91e61cb60aa5fc979a9a0425
2016-04-27 00:36:16 +00:00
TreeHugger Robot
e542e0cb9b Merge "Set installed flag of all users if system app is installed later" into nyc-dev 2016-04-27 00:32:41 +00:00
Tomasz Mikolajewski
52036c743c Merge "Fix index computation for quick viewing." into nyc-dev 2016-04-27 00:30:46 +00:00
Rob Carr
4f40766360 Merge "Touch region fixes for dialogs and overlapping tasks." into nyc-dev 2016-04-27 00:29:59 +00:00
smain@google.com
49d7803f04 resolve merge conflicts of 946609b to nyc-dev
Change-Id: Ic96e9e78d16255bfd2fc43df5180c2b1a766ea2d
2016-04-26 17:25:09 -07:00
Hugo Benichi
61cbccc2bf Remove unused event tags of IpConnectivityEvent
Bug: 28204408
Change-Id: I8de95add30cdf5c35c8129ee1b95d2d648b3316d
2016-04-27 09:12:40 +09:00
Hugo Benichi
5df9d729f6 Better ConnectivityMetricsEvent printing
This patch adds more information printing for IpConnectivity event
classes in android.net.metrics.

example:

ConnectivityMetricsEvent(14:36:35.799, 0, 1026): DhcpClientEvent(wlan0, DhcpRequestingState)
ConnectivityMetricsEvent(14:36:35.805, 0, 1026): DhcpClientEvent(wlan0, DhcpHaveAddressState)
ConnectivityMetricsEvent(14:36:35.809, 0, 4096): IpManagerEvent(wlan0, PROVISIONING_OK, 155ms)
ConnectivityMetricsEvent(14:36:35.810, 0, 1026): DhcpClientEvent(wlan0, DhcpBoundState)
ConnectivityMetricsEvent(14:36:35.871, 0, 2048): NetworkEvent(101, NETWORK_CONNECTED, 0ms)
ConnectivityMetricsEvent(14:36:35.874, 0, 2051): ValidationProbeEvent(101, PROBE_HTTP:599, 3ms)
ConnectivityMetricsEvent(14:36:35.874, 0, 2048): NetworkEvent(101, NETWORK_VALIDATION_FAILED, 0ms)
ConnectivityMetricsEvent(14:36:35.928, 0, 3072): DefaultNetworkEvent(0 -> 101, [WIFI], IPv4: false, IPv6: false)
ConnectivityMetricsEvent(14:36:37.008, 0, 2051): ValidationProbeEvent(101, PROBE_HTTP:204, 134ms)
ConnectivityMetricsEvent(14:36:37.008, 0, 2050): NetworkEvent(101, NETWORK_VALIDATED, 1137ms)

Also fixes a couple of event logging issues:
  - do no record spurious receive DhcpErrorEvent when a network goes down.
  - add an eventType field to IpManagerEvent instead of using the
    loggger component tag.

Bug: 28204408
Change-Id: Ia6f4ccfd7a0c63a5ccec18825f226c0b5781217b
2016-04-27 09:11:29 +09:00
Tomasz Mikolajewski
7c82c92051 Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev
am: ee6d8be

* commit 'ee6d8be53e1dabf7669150e7e7e39daa58cac542':
  Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."

Change-Id: I94fd56620c42796eb0c8c206d96ddfb1f5a8a436
2016-04-27 00:08:25 +00:00
Todd Kennedy
d5e295f919 Don't hold lock when calling externally
Wound up in a deadlock. We held mPackages lock and called the mount
service. This called into the AppOps service which tried to obtain
its lock. On another thread, we held the AppOps service lock which
called into PackageManager service and tried to take mPackages.

Ideally, we'd never hold an internal lock when calling externally.
In practice, that's not always fixable [for example, code change
would be too great to not hold the AppOps lock when calling into
the PackageManager service].

Bug: 28169075
Change-Id: If0a7f1361c7be9385b1f629f68ebc0556b08ab06
2016-04-26 17:06:38 -07:00
Jeff Sharkey
ee6d8be53e Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev 2016-04-27 00:04:02 +00:00
Phil Weaver
6dde7e75e8 Fix crash with a11y set text with text filters.
A text filter may shorten the text, so we need to use the text
that's actually in the View, not the text we requested, to move
the selection.

Also removing the override of performAccessibilityActionInternal,
which should have been done as part of adding text actions initially.

Bug: 28253708
Change-Id: I184f49dcba0238f4ccc222597cefca258393b263
2016-04-26 17:01:29 -07:00
Chong Zhang
e46060a835 Merge "Request a wallpaper update pass when wallpaper target is set to visible" into nyc-dev
am: b60a830

* commit 'b60a830f8b192eadb6c94bdef99967cc2cddafff':
  Request a wallpaper update pass when wallpaper target is set to visible

Change-Id: I5ce250fe1a7e054cd9f522b82a55d6e408807cd4
2016-04-26 23:37:03 +00:00
Chong Zhang
2f54479f77 Merge "Do not set waitForDebugger if the process to be debugged already started" into nyc-dev
am: 83c4135

* commit '83c4135a3a50c50890c52d9f2d98c7d2c8661fef':
  Do not set waitForDebugger if the process to be debugged already started

Change-Id: I9a4de5653a003f5ec12416d0bf95d6423713c7bd
2016-04-26 23:37:02 +00:00
Erik Kline
3c2977cc57 Merge "Move IPv4 address setting to IpManager" into nyc-dev
am: 844ee77

* commit '844ee77b6af93fcfa758d9530a049ae659ca34f0':
  Move IPv4 address setting to IpManager

Change-Id: Ia31075dfe5551c5ae9d63800dc535462efe3f06a
2016-04-26 23:37:00 +00:00
Chong Zhang
b60a830f8b Merge "Request a wallpaper update pass when wallpaper target is set to visible" into nyc-dev 2016-04-26 23:29:40 +00:00
Chong Zhang
83c4135a3a Merge "Do not set waitForDebugger if the process to be debugged already started" into nyc-dev 2016-04-26 23:28:06 +00:00
Erik Kline
844ee77b6a Merge "Move IPv4 address setting to IpManager" into nyc-dev 2016-04-26 23:27:48 +00:00
Todd Kennedy
b107271813 Don't override pre-release target sdk
If a package targets a pre-release SDK [eg a letter version] it should not
be allowed to be upgraded by a release SDK [eg a number version]. If one
absolutely must upgrade to a release SDK, use the "--force-sdk" option
during install.

Bug: 28345311
Change-Id: Ic9fb209968e7c5da2c80c5ca4c0f44f5125f610a
2016-04-26 16:25:43 -07:00
Chong Zhang
efd9a5ba01 Finish immediately if the resumed activity is already visible
When in FINISH_AFTER_VISIBLE mode, we need to check visibility of
both the current activity, and the activity to be resumed. If the
resumed activity is already visible, we should finish immediately.
We can't put it into stopping state and wait because there won't be
a window visible callback from the next activity.

bug: 28378359

Change-Id: Ib1fb44acfec33616da76f48102cc00b453e41914
2016-04-26 16:24:24 -07:00
Hangyu Kuang
da802f5100 Unhide getHdrCapabilities and HdrCapabilities.
Bug:25684127
Change-Id: Ibeefc566213da5b76deba13eb2224916a4fefd13
2016-04-26 23:04:56 +00:00
Michael Wright
9ff94c0251 Plumb HDR capabilities to Display
Bug: 25684127
Change-Id: I0a4fcdc59aa1a7b295c8df03699466685300e735
2016-04-26 23:04:30 +00:00
Jeff Sharkey
e75c0b9873 Fix two multi-user bugs in package upgrade.
When upgrading a package, we need to fill in the "origUsers" field
so that we can clone the installed state correctly.  This was done
for child package, but never set for the parent package.

Also fix a bug where a secondary user requested a package to be
moved.  Because that move was pushed onto a Handler, the calling
userId appeared to be the device owner instead of the user that
actually requested the move.  (Later in the upgrade flow there is
code that force-installs the package for the requesting user.)

Bug: 26729822
Change-Id: I2d2a007c73558f29a3f8c1408ec373fce6e87761
2016-04-26 17:01:42 -06:00
Oren Blasberg
6ba68207a3 Merge "Show cascading popup menus if screen is big enough." into nyc-dev
am: c71b630

* commit 'c71b6302fe368ca2fbd4555177acf3cd157f6340':
  Show cascading popup menus if screen is big enough.

Change-Id: I253cec6780f083e915f073b501de47d1e970e8ff
2016-04-26 22:50:16 +00:00
fionaxu
c1df936c16 Merge "Add CarrierConfig for metered roaming" into nyc-dev
am: 73efde0

* commit '73efde04efc5d8e36cf1eb2e0fa2bb52a4a326e1':
  Add CarrierConfig for metered roaming

Change-Id: Ic3955a4a208dcf206d607cda25eee03c37e96a1e
2016-04-26 22:50:14 +00:00
Oren Blasberg
1fab8d995e Merge "Accommodate NaN in new context menu methods." into nyc-dev
am: a86d1e0

* commit 'a86d1e0b5938cee1d76aefcc1e8967c353ea922d':
  Accommodate NaN in new context menu methods.

Change-Id: I16e5660e880e1b88b5d2b96fc403ba4becefefec
2016-04-26 22:50:12 +00:00
Oren Blasberg
bddf236208 Merge "Don\'t show icons for top level menus unless forced." into nyc-dev
am: 0967da3

* commit '0967da398901dd2ac626152a4802c822ca36c63b':
  Don't show icons for top level menus unless forced.

Change-Id: I50b66d5f2a3b133300dc40e57d7acb393e0ce403
2016-04-26 22:50:09 +00:00
Shreyas Basarge
bfd93e9d9d Merge "Account info on job wakelocks" into nyc-dev
am: 8fcf6a6

* commit '8fcf6a692262dc182c844b35337b67aeb320021d':
  Account info on job wakelocks

Change-Id: I864e9c089e2ddcab1b3d00db85013af14ebed8fa
2016-04-26 22:50:06 +00:00
Ruben Brunk
45d61923df Merge "Add manifest attribute for VR activities." into nyc-dev
am: f84b3e0

* commit 'f84b3e0e2fe11c8ee1d86ad44236ba4129fc3ae1':
  Add manifest attribute for VR activities.

Change-Id: I6450e6237a9e5a2bc275d465d758a3e70a66fb23
2016-04-26 22:50:02 +00:00
Oren Blasberg
c71b6302fe Merge "Show cascading popup menus if screen is big enough." into nyc-dev 2016-04-26 22:43:39 +00:00
Chen Xu
73efde04ef Merge "Add CarrierConfig for metered roaming" into nyc-dev 2016-04-26 22:42:18 +00:00
John Reck
e94cbc76d5 API tweaks to PixelCopy and make it public
Bug: 27708453
Change-Id: I81667ce42f9ca1c1a13e1e61299927900845fc84
2016-04-26 15:41:43 -07:00