Commit Graph

245370 Commits

Author SHA1 Message Date
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
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
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
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
Oren Blasberg
a86d1e0b59 Merge "Accommodate NaN in new context menu methods." into nyc-dev 2016-04-26 22:41:01 +00:00
Oren Blasberg
0967da3989 Merge "Don't show icons for top level menus unless forced." into nyc-dev 2016-04-26 22:38:58 +00:00
Chris Craik
e98a046d31 Fix oval positioning when drawn with patheffect
Fixes: 28396277

Change-Id: I9e21696d81d7cd219f3eaa081bf3d9ba988fe051
2016-04-26 15:38:33 -07:00
Shreyas Basarge
8fcf6a6922 Merge "Account info on job wakelocks" into nyc-dev 2016-04-26 22:36:47 +00:00
Cheryl Potter
5fc7099e1e docs: Polish Android Monitor pages
b/26279420

Change-Id: Ic2ccf9510f51adeb843f7aff9197d59e7a532fe2
2016-04-26 15:36:41 -07:00
Hangyu Kuang
54ac219184 Revert "Revert "Hook up HDR capabilities from native SurfaceControl""
This reverts commit 2c38f45f27.


Bug:25684127
2016-04-26 22:24:23 +00:00
Deepanshu Gupta
a43c4fa09f Add namespace before attr name in defPropMap
Change-Id: I36d094fb69d5f5ce0aebde04960ffcd19c27a2eb
2016-04-26 15:19:31 -07:00
Antonio Cansado
3e883daeef Fixing network tags.
- History was not populating the tag, so all of them appeared as tag 0x0.

Bug: 28345240
Change-Id: I9c898695bbe8d18531f7ea432ebb8f02d72e5d27
2016-04-26 22:18:52 +00:00
Kevin Hufnagle
171a1c2546 Merge changes If868f090,I3b7c39c4,I0c2152ed,I79796636,I6dc87bac, ... into mnc-ub-dev
* changes:
  Merge "docs: Added section describing Launcher Shortcuts." into mnc-mr-docs am: 9d4afa9 am: ecb8164
  Merge "docs: Document test artifact preference setting b/24810371" into mnc-mr-docs am: a6d7a32 am: dd4cc3b
  add 64-bit requirement for linux bug: 26288626 am: 584d18b am: 40ed41b
  Merge "Removed mention of JRE8 in sdk setup" into mnc-mr-docs am: 2f24634 am: cabbf5c3
  Merge "update system reqs for accelerated emulator bug: 27817059" into mnc-mr-docs am: 69c05a7 am: 6a9dcc7
  There is no GCC 4.6. am: 7ca1829 am: 4fa2558
  Remove obsolete note about libatomic. am: 59daf35 am: 7fd9ff6
  Remove an obsolete paragraph. am: e2ff842 am: e57e4b3
  Remove an out of date detail. am: 931a0a4 am: ff0d46f
  Fix case of libc++. am: 3e94f7e am: cbd6ce1
  Merge "Fix typo." into mnc-mr-docs am: ad5d64b am: dbfb0c6
  Merge "docs: Remove obsolete deep link term from AS 2.0 Code Tools page b/28075206" into mnc-docs am: b93a913 am: 33f241d am: d67e559
  Merge "Docs: minor AS 2.0 related fixes" into mnc-mr-docs am: a598807 am: 9d9cea5
  Merge "docs: Document test artifact preference setting b/24810371" into mnc-docs am: 53ae576  -s ours am: 0c615f4 am: bb93651
  Merge "Docs: Minor fixes to Background Optimizations and Doze docs" into mnc-mr-docs am: 6bd5c3d am: a572a3a
  URLs are hard, Mr. Eason. am: 9938f2b am: 6c5079b
  add studio 2.0 blog post to the "latest" feed for studio landing page am: 2e4bcfd am: 78fab38
  delete irrelevant manifest documentation am: 3c8d502 am: 1800bef
  Merge "make hero header and image link to download studio" into mnc-mr-docs am: 2890c65 am: f6783df
  Merge "Docs: Added image for CTL config" into mnc-mr-docs am: 78bad64 am: df51dd1
  add notice about compatiblity with N Preview (bug:27830549) improve linux 32-bit library information (bug:27962189), add a note about JDK 8 compatibility on Mac, and a few other edits to installation guide and system reqs. am: d69b727 am: 1b30208
  Merge "Docs: Added release notes for SDK Tools 25.0.0" into mnc-mr-docs am: ffb094d am: 16c507d
  Merge "Add 2.0 download file names, sizes, sums" into mnc-mr-docs am: 8a7a91d am: 3443287
  Merge "docs: Updated support library release notes for 23.3.0" into mnc-mr-docs am: 3db9afa am: a37dd29
  Merge "add instructions to change Android SDK location when using N Preview bug: 28017690" into mnc-mr-docs am: e5cbba2 am: 414150f
  Merge "Docs: Added AS 2.0 Release Notes" into mnc-mr-docs am: a49d235 am: ecb082f
  Merge "docs: Data Binding 2.0 updates b/26892478" into mnc-docs am: 2ebdbd2 am: a9b10e3 am: e10717c
  Merge "docs: Emulator 25.0.10 docs for AS 2.0 release b/24816712" into mnc-docs am: 9e9b15e am: 566c9be am: b0ccc39
  Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am: e60e315 am: f2a8f83
  Merge "docs: AVD Manager docs for AS 2.0 b/26907919" into mnc-docs am: 8dbdfc4 am: 027d322 am: 97c36d3
2016-04-26 22:11:40 +00:00
Kevin Hufnagle
7659acc0e7 Merge changes I4bf40d49,I8c1b82f0,I6128b520,Icf1428e3,I44704847, ... into mnc-ub-dev
* changes:
  Merge "docs: Enhanced description of "direct reply" workflow." into mnc-mr-docs am: 4a17d8f am: a9738fe
  Merge "doc: Update N Preview release notes for DP2." into mnc-mr-docs am: 5f8bdb9 am: 1ccba99
  Merge "docs: Updates to API Overview for N Preview 2" into mnc-mr-docs am: f2e37da am: 9dc1761
  docs: Updating Android for Work N Preview page for DP2. am: 7037a86 am: acb8d48
  Merge "docs: Fixed "known issues" link." into mnc-mr-docs am: 464d3d6 am: 69f2aba
  Merge "Docs: Behavior Changes doc for N Developer Preview 2" into mnc-mr-docs am: c79b6ec am: fc7b97b
  Merge "docs: Clarified structure of security config file." into mnc-mr-docs am: c3cada0 am: 0e6f90e
  Merge "Word the section about libc++ more strongly." into mnc-mr-docs am: 021c306 am: de5da71
  Merge "new doc about shrinking code and resources (massive re-write of proguard doc). bug: 27746083" into mnc-mr-docs am: 01d3063 am: 7ceca13
  Merge "docs: Added resource card to AdMob Ads page in DAC" into mnc-mr-docs am: 7ba3c05 am: 7a084e1
  Merge "docs: Fixed capitalization error in method name." into mnc-mr-docs am: 09fab6d am: 36223fa
  Merge "docs: Updated link, wording associated with data-sharing IPC." into mnc-mr-docs am: c501688 am: 7bce49c
  Merge "docs: Fixed "APK signature scheme v2" link in N API Overview." into mnc-mr-docs am: e84d9ce am: 6d683d2
  Merge "Docs: Android Plugin DSL Ref 2.0.0 was just published. Added some useful links." into mnc-mr-docs am: 80202c0 am: a1b59e1
  Merge "docs: Updates to Multi-Window/PiP APIs for Preview 2" into mnc-mr-docs am: bd7c1b4 am: 194c1e6
  Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs am: d00f005 am: 94e5237
  docs: Remove texture compression formats that don\'t exist am: 2112afe am: 8d949de
  Merge "Clarified how to regenerate debug.keystore" into mnc-mr-docs am: 1452c87 am: 98a02c0
  Merge "docs: Updating PIP N preview docs for DP2" into mnc-mr-docs am: f5b6b18 am: e7a6e43
  Merge "docs: Updating Scoped Directory Access preview docs for DP2" into mnc-mr-docs am: bc90f38 am: d77a4db
  Merge "docs: Updating Direct Boot N preview docs for DP2" into mnc-mr-docs am: 69f6e5b am: 3aa606f
2016-04-26 22:10:42 +00:00
Ruben Brunk
f84b3e0e2f Merge "Add manifest attribute for VR activities." into nyc-dev 2016-04-26 22:05:30 +00:00
Android Build Merger (Role)
5475c951bc Merge "Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs am: cffbbc8 am: 8af8d4d am: 13308fc2 am: 39579d7" into nyc-dev 2016-04-26 21:58:53 +00:00
Android Build Merger (Role)
359b10d739 Merge "Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am: b9709f6 am: c4ec690 am: 73b5cc9" into nyc-dev 2016-04-26 21:58:43 +00:00
Android Build Merger (Role)
3b934467d4 Merge "change Mac JDK requirement to 6 am: 611a2f4 am: 3b1f66c am: 0619ef2" into nyc-dev 2016-04-26 21:58:33 +00:00
Android Build Merger (Role)
c5f684f6f7 Merge "Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am: 3dbc405 am: 6eed040 am: f654443" into nyc-dev 2016-04-26 21:58:22 +00:00
Android Build Merger (Role)
7a82b58a8a Merge "Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am: b896cd1 am: abb5afc am: fe47b6d" into nyc-dev 2016-04-26 21:58:11 +00:00
Android Build Merger (Role)
b14b1fd9fa Merge "Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am: 7961413 am: 88d1e91 am: 8776f89" into nyc-dev 2016-04-26 21:58:03 +00:00
Android Build Merger (Role)
da816e80bc Merge "Update studio landing page and add all-new install flow docs. bug: 27850063 (update system reqs for 2.0) bug: 27725026 (update download page for 2.0) bug: 23908299 (clean up download and get started) am: 9577d31 am: fc35cf2 am: 478463a" into nyc-dev 2016-04-26 21:57:53 +00:00
Android Build Merger (Role)
5a073da32b Merge "Merge "docs: "Result is:" paragraph now in correct position on page." into mnc-mr-docs am: 7c909cc am: 090e5fb am: 5f6a355" into nyc-dev 2016-04-26 21:57:42 +00:00
Android Build Merger (Role)
239d2c2ea2 Merge "Merge "docs: Added new partner logos to the car brands section of auto index page." into mnc-docs am: 63f15a9 am: e7b8c79 am: 29c6f81 am: 26ed50a" into nyc-dev 2016-04-26 21:57:32 +00:00
Android Build Merger (Role)
9dd786c7ee Merge "Merge "Add missing </pin-set>" into mnc-mr-docs am: 5f415c2 am: 0ed59f9 am: f1ac8fa" into nyc-dev 2016-04-26 21:57:21 +00:00
Android Build Merger (Role)
c41d00358c Merge "Merge "Fix application manifest XML" into mnc-mr-docs am: c8dcc2b am: 3fdc800 am: fc688ec" into nyc-dev 2016-04-26 21:57:12 +00:00
Android Build Merger (Role)
124260fe65 Merge "Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am: 4ec3749 am: 83113d6 am: 824429f" into nyc-dev 2016-04-26 21:57:04 +00:00
Android Build Merger (Role)
641fbbd3f3 Merge "Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am: 242f06cd am: 0015bf0 am: bb64fe3" into nyc-dev 2016-04-26 21:56:54 +00:00
Android Build Merger (Role)
8b10dd2054 Merge "Merge "Updates for Play." into mnc-mr-docs am: 3afd52a am: f4658e2 am: ab3721a" into nyc-dev 2016-04-26 21:56:46 +00:00
Android Build Merger (Role)
ae9e686ffc Merge "Merge "docs: Add note about missing recording functionality in Live Channels" into mnc-mr-docs am: cac018b am: 9e16ddc am: 461e731" into nyc-dev 2016-04-26 21:56:26 +00:00
Android Build Merger (Role)
df5e1470aa Merge "Merge "docs: Fixed namespace shown in a line of style XML" into mnc-mr-docs am: 2f5a204 am: ddbf8d2c am: f63a1c4" into nyc-dev 2016-04-26 21:56:15 +00:00
Android Build Merger (Role)
d3ca191a3f Merge "Merge "docs: Removed dead link in "create project" TOC." into mnc-mr-docs am: f380435 am: 0da507d am: 7f0d4d0" into nyc-dev 2016-04-26 21:56:04 +00:00
Android Build Merger (Role)
a7435670fd Merge "Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs am: c9afecd am: 1c076e8 am: 8d336e6" into nyc-dev 2016-04-26 21:55:55 +00:00
Android Build Merger (Role)
96eaf3e12d Merge "Merge "docs: Added missing semicolon within code sample." into mnc-mr-docs am: 9deafe5 am: fcf68ef am: c56d885" into nyc-dev 2016-04-26 21:55:45 +00:00