Commit Graph

68598 Commits

Author SHA1 Message Date
Nicolas Geoffray
19e0f615ca Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev am: 7366e8c16a
am: 5a7be749f7

Change-Id: Idb189d89f9cebcc6e9809e7f489c51baae5e8253
2016-07-14 08:49:16 +00:00
Calin Juravle
5a7be749f7 Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev
am: 7366e8c16a

Change-Id: I4f54b1b9c45294b2c3c43e0027ece1e8b38e335f
2016-07-14 08:39:22 +00:00
Nicolas Geoffray
7366e8c16a Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev
* changes:
  [RFC] Special case system apps for profile optimizations
  Compile core-apps according to their own "reason" for A/B
2016-07-14 08:32:52 +00:00
Calin Juravle
0bd7762079 [RFC] Special case system apps for profile optimizations
If the OTA updates a system app which was previously preopted to a non-
preopted state the app might end up being verified at runtime. That's
because by default the apps are verify-profile but for preopted apps
there's no profile.

Do a hacky check to ensure that if we have no profiles (a reasonable
indication that before the OTA the app was preopted) system apps get
compiled with a non-profile filter (by default interpret-only).

Bug: 30032273
Test: Andreas "has verified that Calin's change to A/B works as expected
and promotes things like SystemUI to speed. From my side, that's
ready to be merged"

Change-Id: I7a052a8ea76cab7f649dc993237ea05534d6c4b9
2016-07-14 08:20:29 +00:00
Tomasz Mikolajewski
af885e9fa2 Merge \\"Fix javadoc broken links in DocumentsContract.\\" into nyc-mr1-dev am: 0e7bb571fd
am: 0f2a7ca01e

Change-Id: I219e199647533a22eecf9cb0cdf29057f37798e6
2016-07-14 03:27:49 +00:00
Tomasz Mikolajewski
0f2a7ca01e Merge \"Fix javadoc broken links in DocumentsContract.\" into nyc-mr1-dev
am: 0e7bb571fd

Change-Id: I45a178f0897fd837307131007529286ca4af0025
2016-07-14 03:21:51 +00:00
Tomasz Mikolajewski
0e7bb571fd Merge "Fix javadoc broken links in DocumentsContract." into nyc-mr1-dev 2016-07-14 03:16:42 +00:00
Selim Cinek
7c2097fb1f Merge \"Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev am: a7ebd4f4bb\" into nyc-mr1-dev-plus-aosp
am: 36c6cf1bdc

Change-Id: I5ecebb835b60f163ad1d6cdff41b30c5590eb8cc
2016-07-14 02:06:34 +00:00
Adam Lesinski
c7502cc7b5 Merge \\\"Don\\\'t hold on to AssetManager instances\\\" into nyc-dev am: f8e99e72e7 am: 165e9d92b2
am: 3d53abec7d

Change-Id: Ife9502a444f46d6327e08248833814bd2357d7a2
2016-07-14 02:06:28 +00:00
Android Build Merger (Role)
36c6cf1bdc Merge "Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev am: a7ebd4f4bb" into nyc-mr1-dev-plus-aosp 2016-07-14 01:59:25 +00:00
Selim Cinek
46aeea5dc1 Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
am: a7ebd4f4bb

Change-Id: Id3ffe5addb5e036eeda993d8dd6603b88c785804
2016-07-14 01:58:52 +00:00
Adam Lesinski
3d53abec7d Merge \\"Don\\'t hold on to AssetManager instances\\" into nyc-dev am: f8e99e72e7
am: 165e9d92b2

Change-Id: I184f3508fd602409d01f105500693b5d02ab37a3
2016-07-14 01:57:52 +00:00
Adam Lesinski
165e9d92b2 Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am: f8e99e72e7

Change-Id: Id29ae90fd336657d428a15fa0730b95d717386db
2016-07-14 01:50:52 +00:00
Adam Lesinski
ce9cf64eb3 Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am: f8e99e72e7

Change-Id: I71b7499c6399ecbf1d8e8d93bf410aabbb2a1044
2016-07-14 01:50:52 +00:00
TreeHugger Robot
a7ebd4f4bb Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
* changes:
  Fixed a bug where the headsup would be stuck disappearing
  Changed the appearance of phone call notifications
2016-07-14 01:38:53 +00:00
Phil Weaver
35dc926772 Merge \"Behave if the same view gets a11y focus twice.\" into nyc-mr1-dev
am: 93d51af336

Change-Id: I7ea7779f5f8735d6c10743eb3e7199b5a1d6c85d
2016-07-14 01:31:25 +00:00
Phil Weaver
93d51af336 Merge "Behave if the same view gets a11y focus twice." into nyc-mr1-dev 2016-07-14 01:25:05 +00:00
Adam Lesinski
e60064ab3c Don't hold on to AssetManager instances
If we enter multi-window mode or load WebView
assets into a Resources object, then the underlying
AssetManager instance may change.

crbug.com/627586

Bug:30118654

Change-Id: I837637bdad5370809db7f060d7d8536b536cad9e
2016-07-14 00:22:12 +00:00
Wei Liu
2cd9eb7c35 Merge \\"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\\" into nyc-mr1-dev am: 6e8630307a
am: 05c2c22a80

Change-Id: I8af1193d4af465f234c8ba08ff0eeefa7279e029
2016-07-14 00:15:25 +00:00
Wei Liu
05c2c22a80 Merge \"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\" into nyc-mr1-dev
am: 6e8630307a

Change-Id: I7e381d5d62f9c79b0c604518ff6ea2d1d9c38dc4
2016-07-14 00:08:07 +00:00
Wei Liu
6e8630307a Merge "Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting." into nyc-mr1-dev 2016-07-13 23:59:28 +00:00
Ashutosh Joshi
5bcbe74198 Merge \"Merge \\"Add state for loading/unloading apps\\" into nyc-mr1-dev am: 2e42020eab\" into nyc-mr1-dev-plus-aosp
am: 5c99851d23

Change-Id: I0f52f1406840b9ddcfe9dd30c19c5ea01755039f
2016-07-13 23:46:22 +00:00
Ashutosh Joshi
0ce29c421e Merge \\"MediaPlayer: fix typo for OnInfoListener.\\" into nyc-mr1-dev am: ebc3c9ca3f
am: 3ed59e2fda

Change-Id: Ib10558712b5e7abe1b0a853eceb4c20beacd6153
2016-07-13 23:31:13 +00:00
Ashutosh Joshi
d9a081e27a Merge \"Add state for loading/unloading apps\" into nyc-mr1-dev
am: 2e42020eab

Change-Id: Ie2899e0eb301fd33ca2546fe854a5109a24906b2
2016-07-13 23:25:48 +00:00
Wei Jia
3ed59e2fda Merge \"MediaPlayer: fix typo for OnInfoListener.\" into nyc-mr1-dev
am: ebc3c9ca3f

Change-Id: I768ec161cc5350d6014127269c9b1f0901a1a923
2016-07-13 23:15:10 +00:00
Ashutosh Joshi
2e42020eab Merge "Add state for loading/unloading apps" into nyc-mr1-dev 2016-07-13 23:04:47 +00:00
Ashutosh Joshi
54787a5f9f Add state for loading/unloading apps
Add state for loading/unloading nanoApps.
Pass on OS response to ContextHubService clients.
Fix Build Breakage due to uninitalized variables.

Bug: 29193948
Change-Id: Ibebecf704bb3ad2583e110f1fcf05400a53b1b4c
2016-07-13 15:28:16 -07:00
Ashutosh Joshi
ebc3c9ca3f Merge "Revert "Add state for loading/unloading apps"" into nyc-mr1-dev 2016-07-13 22:17:37 +00:00
Ashutosh Joshi
f6029bbbcf Revert "Add state for loading/unloading apps"
This reverts commit 00b351aeef.

Change-Id: Iee229adff8fec4f2407aa895886e63953f0d7d32
2016-07-13 22:15:19 +00:00
Ashutosh Joshi
49805052e8 Merge \\"Add state for loading/unloading apps\\" into nyc-mr1-dev am: a980cba4d8
am: f4ba21c420

Change-Id: I51c696280b4fd322cde7f4701bbf6b0042a7ab3e
2016-07-13 22:03:05 +00:00
Ashutosh Joshi
f4ba21c420 Merge \"Add state for loading/unloading apps\" into nyc-mr1-dev
am: a980cba4d8

Change-Id: I49333eb66bf8846e370b94b3c0c10c72664b5b2b
2016-07-13 21:57:29 +00:00
Selim Cinek
06e9e1fe00 Changed the appearance of phone call notifications
Change-Id: Ibf8f9b266428fdd5374ee824ec4c2df10daeb9a7
Fixes:28269355
2016-07-13 14:56:05 -07:00
Ashutosh Joshi
a980cba4d8 Merge "Add state for loading/unloading apps" into nyc-mr1-dev 2016-07-13 21:51:32 +00:00
Adrian Roos
52396abf56 Merge \\"ApplicationErrorReport: Sanitize stack trace\\" into nyc-mr1-dev am: a07af1ee35
am: f1d5c81aa0

Change-Id: I8ae41d7eb65ad5e3907880df2ca2dcf503735d2d
2016-07-13 21:45:09 +00:00
Adrian Roos
f1d5c81aa0 Merge \"ApplicationErrorReport: Sanitize stack trace\" into nyc-mr1-dev
am: a07af1ee35

Change-Id: I26689370456dd424474683fca95950bd229bbe73
2016-07-13 21:39:59 +00:00
Adrian Roos
a07af1ee35 Merge "ApplicationErrorReport: Sanitize stack trace" into nyc-mr1-dev 2016-07-13 21:34:19 +00:00
Phil Weaver
0aaf427550 Behave if the same view gets a11y focus twice.
In some corner cases, ViewRootImpl#setAccessibilityFocus
can be called twice for the same view. Make sure we're
actually changing views before clearing accessibility focus
to avoid inconsistent state.

Bug: 29637593
Change-Id: I5dc6f05bdeaec55c352417bfca92c11bd03c3c10
(cherry picked from commit da4692774c)
2016-07-13 21:26:16 +00:00
Makoto Onuki
c7b4815f23 Merge \\"Revert \\"Revert \\"Revert \\"Handle package broadcasts before apps do\\"\\"\\"\\" into nyc-mr1-dev am: 6eefe67b2c
am: a74fce83ae

Change-Id: I8dcd074a8075e38416da0d6e3570545f17d6bc15
2016-07-13 20:27:48 +00:00
Makoto Onuki
a74fce83ae Merge \"Revert \"Revert \"Revert \"Handle package broadcasts before apps do\"\"\"\" into nyc-mr1-dev
am: 6eefe67b2c

Change-Id: I514fb0b48c79644f7bc3154b3a18fabfc4c35d15
2016-07-13 20:21:56 +00:00
Makoto Onuki
6eefe67b2c Merge "Revert "Revert "Revert "Handle package broadcasts before apps do"""" into nyc-mr1-dev 2016-07-13 20:13:53 +00:00
Chong Zhang
9c68b2b076 Merge \\"Revert changes to force layout after insets changes\\" into nyc-mr1-dev am: 185131442b
am: 12fad318b1

Change-Id: I881ff5642a7b1b748d948345728acd3ceb4b9855
2016-07-13 19:50:18 +00:00
Chong Zhang
12fad318b1 Merge \"Revert changes to force layout after insets changes\" into nyc-mr1-dev
am: 185131442b

Change-Id: I7d3eaa1d0337c0ae62ee24169b76f1938b8b9e68
2016-07-13 19:44:37 +00:00
Chong Zhang
185131442b Merge "Revert changes to force layout after insets changes" into nyc-mr1-dev 2016-07-13 19:39:08 +00:00
Ashutosh Joshi
00b351aeef Add state for loading/unloading apps
Add state for loading/unloading nanoApps.
Pass on OS response to ContextHubService clients.

Bug: 29193948

Change-Id: I700f3bdbb8e84413455751dec02a812a639421b3
2016-07-13 12:29:19 -07:00
Chong Zhang
75eccbd0ff Revert changes to force layout after insets changes
Alternative fix for b/29391054 ag/1152795 sends an MOVE message to
client which also force a layout, so we no longer need to force
it after the insets change in the traversal.

Reverting the following two related fixes as it does more
measures than necessary.

bug: 29391054
bug: 29533997
bug: 29634368

Revert "Fix layout issue after insets changed"

This reverts commit 76fdbb72c9.

Revert "Do a forceLayout if pending insets is changed after relayout window"

This reverts commit 71f2c31469.
2016-07-13 19:24:04 +00:00
Makoto Onuki
f34c308dfd Revert "Revert "Revert "Handle package broadcasts before apps do"""
This reverts commit 886ba78dfb.

With the tests updated.

Change-Id: I162e6ca23c667f90feddc1e9f42b554a416295cf
2016-07-13 10:40:31 -07:00
Makoto Onuki
2adc0c392e Merge \\"Revert \\"Revert \\"Handle package broadcasts before apps do\\"\\"\\" into nyc-mr1-dev am: 98802f6007
am: 80dd14e061

Change-Id: I32fcfdc3fb90fe7b0ac14239a721769234c7cb2f
2016-07-13 17:34:11 +00:00
Adrian Roos
732ae95fbf ApplicationErrorReport: Sanitize stack trace
Makes sure that the size of the stack trace does not exceed
40 KiBi, to ensure that even errors with large stack traces
are properly reported to ActivityManagerService. For good
measure, also ensure that the exception message is not too
long either.

Change-Id: Id8a99094023c15a981b1b79fd9ee0d803921e220
Fixes: 29918978
2016-07-13 17:25:18 +00:00
Makoto Onuki
80dd14e061 Merge \"Revert \"Revert \"Handle package broadcasts before apps do\"\"\" into nyc-mr1-dev
am: 98802f6007

Change-Id: I51e9cedb8cba67b987f8ed6b92bcf66082594990
2016-07-13 17:18:16 +00:00
Makoto Onuki
98802f6007 Merge "Revert "Revert "Handle package broadcasts before apps do""" into nyc-mr1-dev 2016-07-13 17:09:37 +00:00