Commit Graph

8084 Commits

Author SHA1 Message Date
Adrian Roos
4dd85783ca Merge "Fix MessagingStyle HUNs" into nyc-dev
am: 5aa8e7d

* commit '5aa8e7d1f12f78dde892bdc6698550e8d1c558c4':
  Fix MessagingStyle HUNs

Change-Id: Ia69ff8eb3ab8a650af205b17e8f64bc877b7df64
2016-04-27 23:32:18 +00:00
Selim Cinek
b12c2e98e9 Merge "Handle empty bigTexts more gracefully" into nyc-dev
am: 1689203

* commit '1689203d5cc33c2490169d7998cf3ffbeb5d35fc':
  Handle empty bigTexts more gracefully

Change-Id: I3e81fdf19cdb4dd9a81e7cd1e1fd61769de0fdf1
2016-04-27 23:31:59 +00:00
Adrian Roos
975c918d24 Merge "Fix remote input view clobbering" into nyc-dev
am: 1a101db

* commit '1a101dbc81151942eafaa95762c2e3fd53ceb05f':
  Fix remote input view clobbering

Change-Id: I5166a5594e846576f395031978490be5aa412cd9
2016-04-27 23:31:30 +00:00
Adrian Roos
5aa8e7d1f1 Merge "Fix MessagingStyle HUNs" into nyc-dev 2016-04-27 23:17:08 +00:00
Selim Cinek
1689203d5c Merge "Handle empty bigTexts more gracefully" into nyc-dev 2016-04-27 22:59:03 +00:00
TreeHugger Robot
1a101dbc81 Merge "Fix remote input view clobbering" into nyc-dev 2016-04-27 22:17:33 +00:00
Robert Carr
6ad97390a3 Merge "Fix crash when docking." into nyc-dev
am: 45ee78c

* commit '45ee78c083906eca68cdade9bc98b64a83372307':
  Fix crash when docking.

Change-Id: Ic2de9854c107886f45024eb4bc620b07b1329a20
2016-04-27 22:06:54 +00:00
Antonio Cansado
79335ba880 Merge "Fixing network tags." into nyc-dev
am: 2c9bb7c

* commit '2c9bb7c09a49442ac871115890f93581aa160d46':
  Fixing network tags.

Change-Id: Ie90d6886bde2182ac81ad1b26bdec93a69565c56
2016-04-27 21:39:56 +00:00
Rob Carr
45ee78c083 Merge "Fix crash when docking." into nyc-dev 2016-04-27 21:36:53 +00:00
Antonio Cansado
2c9bb7c09a Merge "Fixing network tags." into nyc-dev 2016-04-27 21:28:13 +00:00
Selim Cinek
7599878c8a Handle empty bigTexts more gracefully
We're now falling back to the normal text if the bigtext is empty

Bug: 28318145
Change-Id: I5da237780407b62d21f79f7a754736ae1e4a8785
2016-04-27 13:44:13 -07:00
Jeff Sharkey
6ed8ae5ec4 Merge "Only log when system UID finds missing data paths." into nyc-dev
am: 2c3f2c4

* commit '2c3f2c4da90613bafc93ed34e53867da10084212':
  Only log when system UID finds missing data paths.

Change-Id: I90b8fe98181dc2b7d00f0c9d320acce316d637e9
2016-04-27 20:41:19 +00:00
Jeff Sharkey
2c3f2c4da9 Merge "Only log when system UID finds missing data paths." into nyc-dev 2016-04-27 20:34:19 +00:00
Dimitry Ivanov
0c6e213dc7 Merge changes I12c9448e,I928175a3 into nyc-dev
* changes:
  Create linker namespace for the system server classloader
  Extract pathclassloader initialization to a separate class
2016-04-27 20:32:26 +00:00
Dimitry Ivanov
cda22ed541 resolve merge conflicts from goog/stage-aosp-master to goog/nyc-dev-plus-aosp
Change-Id: I09c5c2881947b28547a40febf32f02722b03ef81
2016-04-27 13:16:17 -07:00
Jeff Hao
6fdf5951ae Merge "Support to pass <uses-library> option through to dex2oat." into nyc-dev
am: 864bc48

* commit '864bc48e0104451e20281258429677a9ebbab9ac':
  Support to pass <uses-library> option through to dex2oat.

Change-Id: Ia276b7594e31177f0295e03982aae96267367887
2016-04-27 20:02:24 +00:00
Robert Carr
311ecba981 Fix crash when docking.
ViewRootImpl may be null at this point if
we didn't preserve. Sorry about the churn.

Bug: 28413589
Change-Id: Iebfd819490252b52332d94ccefbddfae160087cf
2016-04-27 12:59:45 -07:00
Jeff Hao
864bc48e01 Merge "Support to pass <uses-library> option through to dex2oat." into nyc-dev 2016-04-27 19:54:04 +00:00
Adam Powell
dd587993ae Merge "Fix a bug where restartLoader would result in a stuck loader" into nyc-dev
am: 596a4a1

* commit '596a4a1592a8f5e7b708d884145e280df9b638d0':
  Fix a bug where restartLoader would result in a stuck loader

Change-Id: I635309e5b37dfca8befdadeb578a71ae1619ac00
2016-04-27 19:18:31 +00:00
TreeHugger Robot
596a4a1592 Merge "Fix a bug where restartLoader would result in a stuck loader" into nyc-dev 2016-04-27 19:12:51 +00:00
Dimitry Ivanov
b1ef62bb38 Extract pathclassloader initialization to a separate class
To be able to reuse this code when creating a classloader for
the system_server.

Bug: http://b/27245894
Bug: http://b/27702070
Change-Id: I928175a39a1beb0446d863a5b8f5edf94686e768
(cherry picked from commit 5d7d777fa6)
2016-04-27 11:38:41 -07:00
Jeff Sharkey
21f507274b Only log when system UID finds missing data paths.
We're really only interested in tracking down when the system UID
tries touching missing data paths, since it's the only one with enough
permissions to mkdirs() directly without going through installd.

Without the guard added in this CL, we'd end up logging for direct
boot aware apps that tried obtaining CE paths while locked, which is
perfectly valid.

Bug: 28272737
Change-Id: Id24f3160f61d8ad8047d5c551bc6a91c868bd301
2016-04-27 12:38:20 -06:00
Dimitry Ivanov
fa8b96c6c1 Merge changes from topic \'target-sdk-0-fix\'
am: 493576b

* commit '493576bc5db94068b5a767021a4a5c8b6963c836':
  Create linker namespace for the system server classloader
  Extract pathclassloader initialization to a separate class

Change-Id: Ifbebd0a98c3d80620b53bf7ebef76222e57ca923
2016-04-27 18:33:55 +00:00
Jeff Hao
c7b9482b0c Support to pass <uses-library> option through to dex2oat.
This change takes an app's shared libraries specified by <uses-library>
and passes it through to dex2oat to be used during compilation.

Part of a multi-project change.

Bug: 26880306

(cherry-picked from 7b331b6a8a)

Change-Id: I523b1b74775e7ed27072498509e743f1f10b1164
2016-04-27 11:11:17 -07:00
Adam Powell
e5552be22a Fix a bug where restartLoader would result in a stuck loader
Framework edition

In some cases restartLoader calls that happen in quick succession
could cause the new loader to become stuck and never run. Treat loader
restarts for loaders that have not yet started the same as starting a
brand new loader.

Bug 27437287
https://code.google.com/p/android/issues/detail?id=56464

Change-Id: Ia4e276fc8e63d43b9c52c6155cea827b194d8b19
2016-04-27 10:42:19 -07:00
Adrian Roos
dedd1df2f2 Fix MessagingStyle HUNs
- Supply the appropriate HUN view
- Make sure we can properly parcel and unparcel the Style

Change-Id: I86c70b9c41689da98f45219b244aac0dec461002
Fixes: 28400885
2016-04-27 07:25:19 -07:00
Adrian Roos
4c1fcc892e Fix remote input view clobbering
- If a notification is updated, make sure that the focus
  is kept even when the change cannot be applied inline.
- Make sure to update the pending intent to match one
  of the new actions in case the old one is no longer
  valid, and to prevent sending text to the wrong action
  unintentionally.
- Keep focus when switching between heads-up and expanded.
- Prevent the action container from becoming transiently
  gone during reapplying.

Fixes: 27357771
Change-Id: Ie9f49935827f6efb15b73f8d686f0c110448456a
2016-04-27 06:57:48 -07:00
Kevin Hufnagle
c959843546 Merge "docs: Clarified purpose of application "name" attr within manifest." into mnc-mr-docs am: c3500321cd am: c9c3ad8 am: 3c8a59f
am: 48a4930

* commit '48a4930ef6d19191b379170b21fe5dce52c91c32':
  docs: Clarified purpose of application "name" attr within manifest.

Change-Id: I62b776f57981548788d9191592040763a00be552
2016-04-27 05:53:10 +00:00
Kevin Hufnagle
48a4930ef6 Merge "docs: Clarified purpose of application "name" attr within manifest." into mnc-mr-docs am: c3500321cd am: c9c3ad8
am: 3c8a59f

* commit '3c8a59fc25e7d1bd777f15ef9712696b341e2a49':
  docs: Clarified purpose of application "name" attr within manifest.

Change-Id: Ic8bb4cc1edbbef00d06d030e1cdae215ceb9d2e5
2016-04-27 05:39:08 +00:00
Kevin Hufnagle
376fc03553 Merge "resolve merge conflicts of 70adfe3 to nyc-dev" into nyc-dev
am: 5dcd5e5

* commit '5dcd5e5ba573a83c779725d1fe8592f26a2ca1d0':
  docs: Fixed whitespace in documents referencing "Application" element.

Change-Id: I803d33b51eafee81200ff65fa946c8ae49044898
2016-04-27 05:36:52 +00:00
Kevin Hufnagle
8ce7d79c64 resolve merge conflicts of 70adfe3 to nyc-dev
Change-Id: I0dbd35b74a8cc1427258b4066d759a6861faba8f
2016-04-26 22:14:38 -07:00
Robert Carr
3c0de7768f Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev
am: 69a6fe3

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

Change-Id: I6f7b52b3d880eede508c12f8d2ffa1c29f17bbd5
2016-04-27 00:54:54 +00:00
Rob Carr
69a6fe321c Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev 2016-04-27 00:47:59 +00: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
Robert Carr
b259485087 Fix bugs with takeSurface and preserveWindows.
When reusing a ViewRoot and DecorView as we do with preserveWindows
there are two issues with SurfaceHolders.  First, we update the
SurfaceHolder callbacks when we call ViewRootImpl.setView. In the
case of preserved window relaunch, the DecorView is reused and there is
no call to setView. We need the ActivityThread to notify the ViewRoot
that something has changed. Secondly, we were assuming the only time
a new surface would be created for the purposes of SurfaceHolder
notification was when we previously did not have a valid surface.
Instead we need to check if the native Surface object has changed each time we
get a result from relayout.

Bug: 28331264
Change-Id: If1b4aab9b2ba579fa040e2a3ab4471842476d82f
2016-04-26 14:33:21 -07:00
Dimitry Ivanov
5d7d777fa6 Extract pathclassloader initialization to a separate class
To be able to reuse this code when creating a classloader for
the system_server.

Bug: http://b/27245894
Bug: http://b/27702070
Change-Id: I928175a39a1beb0446d863a5b8f5edf94686e768
2016-04-26 13:16:54 -07:00
Narayan Kamath
3ec2508c99 LoadedApk: Don\'t set up JIT profile support inside the system_server.
am: 2d4a222

* commit '2d4a222de157c693b16ca2b35a264dd92ae6abee':
  LoadedApk: Don't set up JIT profile support inside the system_server.

Change-Id: I52d0cb275f3d01a094aefed65e43a2882d00679c
2016-04-26 12:18:52 +00:00
Narayan Kamath
2d4a222de1 LoadedApk: Don't set up JIT profile support inside the system_server.
We shouldn't profile *any* packages loaded by the system_server, not
just the system_servers own ("android") package.

bug: 28241500
Change-Id: I5f3f477b40c758030a5bdc8e97d17cab6e68e204
2016-04-26 12:08:23 +00:00
Kevin Hufnagle
3c8a59fc25 Merge "docs: Clarified purpose of application "name" attr within manifest." into mnc-mr-docs am: c3500321cd
am: c9c3ad8

* commit 'c9c3ad8c5efbd390a5fcb3deaf05c831d1daab5c':
  docs: Clarified purpose of application "name" attr within manifest.

Change-Id: I108439d7e3a355372ee131d15ed88129dc4e9764
2016-04-26 08:50:08 +00:00
Kevin Hufnagle
70adfe39ae docs: Fixed whitespace in documents referencing "Application" element. am: 75951d7
am: bffcc25

* commit 'bffcc2559502da35ac12dce8f1ca8518bdbf6c69':
  docs: Fixed whitespace in documents referencing "Application" element.

Change-Id: I4d258b6fa4764f7bd1d06e955659948e70cc8f87
2016-04-26 08:48:48 +00:00
Jeff Sharkey
3bf4cd1fb5 Merge "Track down Contexts without data directories." into nyc-dev
am: 3a10c1e

* commit '3a10c1e86db9843462660d825a9673a3c72ccdd6':
  Track down Contexts without data directories.

Change-Id: Id6934369489b8a60e8d6ceb3de8f7774c5128ed6
2016-04-25 22:57:37 +00:00
Alex Light
7ad3001399 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev
am: 57413a7

* commit '57413a74777060d9368f89966e9abcf96e33af8e':
  Make fake libart for misbehaving apps be loaded.

Change-Id: Iba15cda4cda9968dbe303919427ad192bb940f46
2016-04-25 22:04:53 +00:00
Jeff Sharkey
3a10c1e86d Merge "Track down Contexts without data directories." into nyc-dev 2016-04-25 21:59:41 +00:00
Jeff Sharkey
5df7298c59 resolve merge conflicts of c79a568 to nyc-dev-plus-aosp
Change-Id: I3ee02bc596f285fa41ffcafa882ae5997ef67d22
2016-04-25 15:53:50 -06:00
TreeHugger Robot
57413a7477 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev 2016-04-25 21:53:31 +00:00
Jeff Sharkey
c79a568f18 Merge "API changes for DownloadManager and JobScheduler." into nyc-dev 2016-04-25 20:14:59 +00:00
Dan Sandler
5bab149bce Merge changes from topic \'substitute-notification-app-name\' into nyc-dev
am: 955009f

* commit '955009f9d384d1b19ebb441814ca0a3fac0fbc47':
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.

Change-Id: I709f92bda6edd41abd8b22bbee2d4c887cb8dc1c
2016-04-25 19:34:48 +00:00
Daniel Sandler
955009f9d3 Merge changes from topic 'substitute-notification-app-name' into nyc-dev
* changes:
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.
2016-04-25 19:22:40 +00:00
Jeff Sharkey
24492ae448 Track down Contexts without data directories.
Data directories for all packages should be created and managed by
installd; if we create a Context and the data directory doesn't exist
yet, we're in trouble, since a later mkdirs() would end up creating
the directory with incorrect permissions, mode, and SELinux labels.

Bug: 28272737
Change-Id: Ie3bb884ab07748719378de5c792046a031a3f945
2016-04-25 13:20:29 -06:00
Calin Juravle
2797c1234a Merge "Disable StrictMode policy when setting up profile support" into nyc-dev
am: 096e2dc

* commit '096e2dcf855714577bb86eaa4869ff46b5980a07':
  Disable StrictMode policy when setting up profile support

Change-Id: I430da856430046c5e2751232b427505962615b33
2016-04-25 17:16:37 +00:00